mirror of
https://github.com/golang/go
synced 2024-11-25 06:47:56 -07:00
goinstall: use bash to execute gomake
R=golang-dev, r, adg CC=golang-dev https://golang.org/cl/4551074
This commit is contained in:
parent
1042572528
commit
9107b530d8
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user