Skip to content

Commit 4632379

Browse files
committed
cmd/go: print CC environment variables on Plan 9
This changes makes the output of `go env` the same as on other operating systems. Fixes #18013. Change-Id: I3079e14dcf7b30c75ec3fde6c78cb95721111320 Reviewed-on: https://go-review.googlesource.com/33396 Reviewed-by: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 5508561 commit 4632379

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/cmd/go/env.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,11 @@ func mkEnv() []envVar {
6262
env = append(env, envVar{"GO386", os.Getenv("GO386")})
6363
}
6464

65-
if goos != "plan9" {
66-
cmd := b.gccCmd(".")
67-
env = append(env, envVar{"CC", cmd[0]})
68-
env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")})
69-
cmd = b.gxxCmd(".")
70-
env = append(env, envVar{"CXX", cmd[0]})
71-
}
65+
cmd := b.gccCmd(".")
66+
env = append(env, envVar{"CC", cmd[0]})
67+
env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")})
68+
cmd = b.gxxCmd(".")
69+
env = append(env, envVar{"CXX", cmd[0]})
7270

7371
if buildContext.CgoEnabled {
7472
env = append(env, envVar{"CGO_ENABLED", "1"})

0 commit comments

Comments
 (0)