mirror of
https://github.com/golang/go
synced 2024-11-25 03:47:57 -07:00
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
This commit is contained in:
parent
b08a3164c0
commit
de2fcae372
@ -33,8 +33,6 @@ const (
|
|||||||
var extraEnv = []string{
|
var extraEnv = []string{
|
||||||
"CC",
|
"CC",
|
||||||
"GOARM",
|
"GOARM",
|
||||||
"GOHOSTARCH",
|
|
||||||
"GOHOSTOS",
|
|
||||||
"PATH",
|
"PATH",
|
||||||
"TMPDIR",
|
"TMPDIR",
|
||||||
"USER",
|
"USER",
|
||||||
@ -409,7 +407,9 @@ func (b *Builder) envv() []string {
|
|||||||
}
|
}
|
||||||
e := []string{
|
e := []string{
|
||||||
"GOOS=" + b.goos,
|
"GOOS=" + b.goos,
|
||||||
|
"GOHOSTOS=" + b.goos,
|
||||||
"GOARCH=" + b.goarch,
|
"GOARCH=" + b.goarch,
|
||||||
|
"GOHOSTARCH=" + b.goarch,
|
||||||
"GOROOT_FINAL=/usr/local/go",
|
"GOROOT_FINAL=/usr/local/go",
|
||||||
}
|
}
|
||||||
for _, k := range extraEnv {
|
for _, k := range extraEnv {
|
||||||
@ -424,7 +424,9 @@ func (b *Builder) envv() []string {
|
|||||||
func (b *Builder) envvWindows() []string {
|
func (b *Builder) envvWindows() []string {
|
||||||
start := map[string]string{
|
start := map[string]string{
|
||||||
"GOOS": b.goos,
|
"GOOS": b.goos,
|
||||||
|
"GOHOSTOS": b.goos,
|
||||||
"GOARCH": b.goarch,
|
"GOARCH": b.goarch,
|
||||||
|
"GOHOSTARCH": b.goarch,
|
||||||
"GOROOT_FINAL": `c:\go`,
|
"GOROOT_FINAL": `c:\go`,
|
||||||
"GOBUILDEXIT": "1", // exit all.bat with completion status.
|
"GOBUILDEXIT": "1", // exit all.bat with completion status.
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user