qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-13 18:30:26 -07:00
Code Releases Activity

cmd/go: do not print GCC environment variables on Plan 9

Browse Source 
R=seed, rminnich, r, minux.ma
CC=golang-dev
https://golang.org/cl/7397059
This commit is contained in:
Anthony Martin 2013-02-26 08:34:47 -08:00
parent a5e42f2611
commit c14d255ac5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/go/env.go
View File

@ -34,12 +34,10 @@ func mkEnv() []envVar {
b.init() b.init()
env := []envVar{ env := []envVar{
{"CC", b.gccCmd(".")[0]},
{"GOARCH", goarch}, {"GOARCH", goarch},
{"GOBIN", gobin}, {"GOBIN", gobin},
{"GOCHAR", archChar}, {"GOCHAR", archChar},
{"GOEXE", exeSuffix}, {"GOEXE", exeSuffix},
{"GOGCCFLAGS", strings.Join(b.gccCmd(".")[3:], " ")},
{"GOHOSTARCH", runtime.GOARCH}, {"GOHOSTARCH", runtime.GOARCH},
{"GOHOSTOS", runtime.GOOS}, {"GOHOSTOS", runtime.GOOS},
{"GOOS", goos}, {"GOOS", goos},
@ -48,6 +46,12 @@ func mkEnv() []envVar {
{"GOTOOLDIR", toolDir}, {"GOTOOLDIR", toolDir},
} }
if goos != "plan9" {
cmd := b.gccCmd(".")
env = append(env, envVar{"CC", cmd[0]})
env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")})
}
if buildContext.CgoEnabled { if buildContext.CgoEnabled {
env = append(env, envVar{"CGO_ENABLED", "1"}) env = append(env, envVar{"CGO_ENABLED", "1"})
} else { } else {