From b99f8d9ceccd8e3b577724a512636c295d47dbfc Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Thu, 18 Apr 2013 16:42:56 +1000 Subject: misc/dashboard/builder: always do a native build https://codereview.appspot.com/8134043 disabled cgo when cross compiling, this means builders which compile for both amd64 and 386 will be compiling the latter with cgo disabled. This proposal modifies the builder to mirror the dist tool by always doing a native build. Tested on my darwin/amd64 builder and confirmed the result when building darwin/386 is a native 386 build with cgo enabled. R=bradfitz, dsymonds, r, adg CC=golang-dev https://codereview.appspot.com/8842044 --- misc/dashboard/builder/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/dashboard/builder/main.go b/misc/dashboard/builder/main.go index 177857842..9a155bd0c 100644 --- a/misc/dashboard/builder/main.go +++ b/misc/dashboard/builder/main.go @@ -33,8 +33,6 @@ const ( var extraEnv = []string{ "CC", "GOARM", - "GOHOSTARCH", - "GOHOSTOS", "PATH", "TMPDIR", "USER", @@ -409,7 +407,9 @@ func (b *Builder) envv() []string { } e := []string{ "GOOS=" + b.goos, + "GOHOSTOS=" + b.goos, "GOARCH=" + b.goarch, + "GOHOSTARCH=" + b.goarch, "GOROOT_FINAL=/usr/local/go", } for _, k := range extraEnv { @@ -424,7 +424,9 @@ func (b *Builder) envv() []string { func (b *Builder) envvWindows() []string { start := map[string]string{ "GOOS": b.goos, + "GOHOSTOS": b.goos, "GOARCH": b.goarch, + "GOHOSTARCH": b.goarch, "GOROOT_FINAL": `c:\go`, "GOBUILDEXIT": "1", // exit all.bat with completion status. } -- cgit v1.2.1