Commit 9107b530 authored by Alex Brainman's avatar Alex Brainman

goinstall: use bash to execute gomake

R=golang-dev, r, adg
CC=golang-dev
https://golang.org/cl/4551074
parent 10425725
...@@ -21,12 +21,12 @@ import ( ...@@ -21,12 +21,12 @@ import (
func domake(dir, pkg string, root *pkgroot, local, isCmd bool) (err os.Error) { func domake(dir, pkg string, root *pkgroot, local, isCmd bool) (err os.Error) {
needMakefile := true needMakefile := true
if local { if local {
_, err := os.Stat(dir + "/Makefile") _, err := os.Stat(filepath.Join(dir, "Makefile"))
if err == nil { if err == nil {
needMakefile = false needMakefile = false
} }
} }
cmd := []string{"gomake"} cmd := []string{"bash", "gomake"}
var makefile []byte var makefile []byte
if needMakefile { if needMakefile {
if makefile, err = makeMakefile(dir, pkg, root, isCmd); err != nil { if makefile, err = makeMakefile(dir, pkg, root, isCmd); err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment