Commit de2fcae3 authored by Dave Cheney's avatar Dave Cheney

misc/dashboard/builder: always do a native build

https://golang.org/cl/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://golang.org/cl/8842044
parent b08a3164
......@@ -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.
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment