diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2011-06-21 12:26:38 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2011-06-21 12:26:38 +1000 |
| commit | 524d02cbca4255ec4b524bb809f3c2e4cba30b0b (patch) | |
| tree | 6e0b36c909bef67d3944b4aec0c5a9ef2ff2f6c6 | |
| parent | ceae2c930159cce83407be3489d3fa896f237429 (diff) | |
| download | go-524d02cbca4255ec4b524bb809f3c2e4cba30b0b.tar.gz go-524d02cbca4255ec4b524bb809f3c2e4cba30b0b.zip | |
builder: run make single-threaded on windows
Will still honor MAKEFLAGS environment variable if set.
R=golang-dev
CC=bradfitz, golang-dev
https://golang.org/cl/4644049
| -rw-r--r-- | misc/dashboard/builder/main.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/misc/dashboard/builder/main.go b/misc/dashboard/builder/main.go index 9377fbe326..9a714fe79f 100644 --- a/misc/dashboard/builder/main.go +++ b/misc/dashboard/builder/main.go @@ -357,7 +357,10 @@ func (b *Builder) envv() []string { "GOROOT_FINAL=/usr/local/go", } for _, k := range extraEnv { - e = append(e, k+"="+os.Getenv(k)) + s, err := os.Getenverror(k) + if err == nil { + e = append(e, k+"="+s) + } } return e } @@ -368,9 +371,14 @@ func (b *Builder) envvWindows() []string { "GOOS": b.goos, "GOARCH": b.goarch, "GOROOT_FINAL": "/c/go", + // TODO(brainman): remove once we find make that does not hang. + "MAKEFLAGS": "-j1", } for _, name := range extraEnv { - start[name] = os.Getenv(name) + s, err := os.Getenverror(name) + if err == nil { + start[name] = s + } } skip := map[string]bool{ "GOBIN": true, |