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

R=seed, rminnich, r, minux.ma
CC=golang-dev
https://golang.org/cl/7397059

diff --git a/src/cmd/go/env.go b/src/cmd/go/env.go
index 1f449d86cbf6cf946aeb3f437af0efe41e7bb2a9..6cab37b486508b84bf91cf402d7f6bdb93ca6908 100644 (file)
--- a/src/cmd/go/env.go
+++ b/src/cmd/go/env.go
@@ -34,12 +34,10 @@ func mkEnv() []envVar {
        b.init()
 
        env := []envVar{
-               {"CC", b.gccCmd(".")[0]},
                {"GOARCH", goarch},
                {"GOBIN", gobin},
                {"GOCHAR", archChar},
                {"GOEXE", exeSuffix},
-               {"GOGCCFLAGS", strings.Join(b.gccCmd(".")[3:], " ")},
                {"GOHOSTARCH", runtime.GOARCH},
                {"GOHOSTOS", runtime.GOOS},
                {"GOOS", goos},
@@ -48,6 +46,12 @@ func mkEnv() []envVar {
                {"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 {
                env = append(env, envVar{"CGO_ENABLED", "1"})
        } else {