mirror of https://github.com/golang/go.git
builder: really set $GOBUILDEXIT for Windows
R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5649074
This commit is contained in:
parent
62fe6914cb
commit
97235a769f
|
|
@ -54,7 +54,7 @@ var (
|
||||||
buildRelease = flag.Bool("release", false, "Build and upload binary release archives")
|
buildRelease = flag.Bool("release", false, "Build and upload binary release archives")
|
||||||
buildRevision = flag.String("rev", "", "Build specified revision and exit")
|
buildRevision = flag.String("rev", "", "Build specified revision and exit")
|
||||||
buildCmd = flag.String("cmd", filepath.Join(".", allCmd), "Build command (specify relative to go/src/)")
|
buildCmd = flag.String("cmd", filepath.Join(".", allCmd), "Build command (specify relative to go/src/)")
|
||||||
failAll = flag.Bool("fail", false, "fail all builds")
|
failAll = flag.Bool("fail", false, "fail all builds")
|
||||||
external = flag.Bool("external", false, "Build external packages")
|
external = flag.Bool("external", false, "Build external packages")
|
||||||
parallel = flag.Bool("parallel", false, "Build multiple targets in parallel")
|
parallel = flag.Bool("parallel", false, "Build multiple targets in parallel")
|
||||||
verbose = flag.Bool("v", false, "verbose")
|
verbose = flag.Bool("v", false, "verbose")
|
||||||
|
|
@ -88,7 +88,7 @@ func main() {
|
||||||
}
|
}
|
||||||
builders[i] = b
|
builders[i] = b
|
||||||
}
|
}
|
||||||
|
|
||||||
if *failAll {
|
if *failAll {
|
||||||
failMode(builders)
|
failMode(builders)
|
||||||
return
|
return
|
||||||
|
|
@ -383,10 +383,10 @@ func (b *Builder) failBuild() bool {
|
||||||
if hash == "" {
|
if hash == "" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
|
|
@ -496,7 +495,8 @@ func (b *Builder) envvWindows() []string {
|
||||||
"GOARCH": b.goarch,
|
"GOARCH": b.goarch,
|
||||||
"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)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue