]> Cypherpunks repositories - gostls13.git/commitdiff
goinstall: use bash to execute gomake
authorAlex Brainman <alex.brainman@gmail.com>
Mon, 30 May 2011 06:15:08 +0000 (16:15 +1000)
committerAlex Brainman <alex.brainman@gmail.com>
Mon, 30 May 2011 06:15:08 +0000 (16:15 +1000)
R=golang-dev, r, adg
CC=golang-dev
https://golang.org/cl/4551074

src/cmd/goinstall/make.go

index b2ca82b4695f0bf7a15fc86591b9d5ad161a9b32..67c7b93ef307e0541e1bc5cc1d0862227ab99456 100644 (file)
@@ -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 {