builder: really set $GOBUILDEXIT for Windows

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5649074
This commit is contained in:
Alex Brainman 2012-02-13 14:32:45 +11:00
parent 62fe6914cb
commit 97235a769f
1 changed files with 6 additions and 6 deletions

View File

@ -386,7 +386,7 @@ func (b *Builder) failBuild() bool {
log.Printf("fail %s %s\n", b.name, hash) log.Printf("fail %s %s\n", b.name, hash)
if err := b.recordResult(false, "", hash, "", "auto-fail mode run by " + os.Getenv("USER"), 0); err != nil { if err := b.recordResult(false, "", hash, "", "auto-fail mode run by "+os.Getenv("USER"), 0); err != nil {
log.Print(err) log.Print(err)
} }
return true return true
@ -478,7 +478,6 @@ func (b *Builder) envv() []string {
"GOOS=" + b.goos, "GOOS=" + b.goos,
"GOARCH=" + b.goarch, "GOARCH=" + b.goarch,
"GOROOT_FINAL=/usr/local/go", "GOROOT_FINAL=/usr/local/go",
"GOBUILDEXIT=1", // On Windows, exit all.bat with completion status.
} }
for _, k := range extraEnv { for _, k := range extraEnv {
s, err := os.Getenverror(k) s, err := os.Getenverror(k)
@ -497,6 +496,7 @@ func (b *Builder) envvWindows() []string {
"GOROOT_FINAL": "/c/go", "GOROOT_FINAL": "/c/go",
// TODO(brainman): remove once we find make that does not hang. // TODO(brainman): remove once we find make that does not hang.
"MAKEFLAGS": "-j1", "MAKEFLAGS": "-j1",
"GOBUILDEXIT": "1", // exit all.bat with completion status.
} }
for _, name := range extraEnv { for _, name := range extraEnv {
s, err := os.Getenverror(name) s, err := os.Getenverror(name)