From 46323795130e92f26cbbb6bc744298edc8c443e9 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 22 Nov 2016 16:19:25 +0100 Subject: [PATCH] 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 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- src/cmd/go/env.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/cmd/go/env.go b/src/cmd/go/env.go index 7de72ef289..31710b7e6d 100644 --- a/src/cmd/go/env.go +++ b/src/cmd/go/env.go @@ -62,13 +62,11 @@ func mkEnv() []envVar { env = append(env, envVar{"GO386", os.Getenv("GO386")}) } - if goos != "plan9" { - cmd := b.gccCmd(".") - env = append(env, envVar{"CC", cmd[0]}) - env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")}) - cmd = b.gxxCmd(".") - env = append(env, envVar{"CXX", cmd[0]}) - } + cmd := b.gccCmd(".") + env = append(env, envVar{"CC", cmd[0]}) + env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")}) + cmd = b.gxxCmd(".") + env = append(env, envVar{"CXX", cmd[0]}) if buildContext.CgoEnabled { env = append(env, envVar{"CGO_ENABLED", "1"}) -- 2.50.0