From: Alex Brainman <alex.brainman@gmail.com>
Date: Mon, 30 May 2011 06:15:08 +0000 (+1000)
Subject: goinstall: use bash to execute gomake
X-Git-Tag: weekly.2011-06-02~64
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9107b530d82f5f8a7fb32442509668b22e464859;p=gostls13.git

goinstall: use bash to execute gomake

R=golang-dev, r, adg
CC=golang-dev
https://golang.org/cl/4551074
---

diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index b2ca82b469..67c7b93ef3 100644
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -21,12 +21,12 @@ import (
 func domake(dir, pkg string, root *pkgroot, local, isCmd bool) (err os.Error) {
 	needMakefile := true
 	if local {
-		_, err := os.Stat(dir + "/Makefile")
+		_, err := os.Stat(filepath.Join(dir, "Makefile"))
 		if err == nil {
 			needMakefile = false
 		}
 	}
-	cmd := []string{"gomake"}
+	cmd := []string{"bash", "gomake"}
 	var makefile []byte
 	if needMakefile {
 		if makefile, err = makeMakefile(dir, pkg, root, isCmd); err != nil {