From: Alex Brainman <alex.brainman@gmail.com>
Date: Tue, 21 Jun 2011 02:26:38 +0000 (+1000)
Subject: builder: run make single-threaded on windows
X-Git-Tag: weekly.2011-06-23~30
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=524d02cbca4255ec4b524bb809f3c2e4cba30b0b;p=gostls13.git

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
---

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,