1 From 7cc519aa5f84cf8fc7ac8c10fc69aa8040330ea0 Mon Sep 17 00:00:00 2001
2 From: Matt Madison <matt@madison.systems>
3 Date: Mon, 19 Feb 2018 08:49:33 -0800
4 Subject: [PATCH] allow CC and CXX to have multiple words
6 Upstream-Status: Inappropriate [OE specific]
8 Signed-off-by: Matt Madison <matt@madison.systems>
11 src/cmd/go/internal/envcmd/env.go | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
14 diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
15 index afadbad..cedbfbf 100644
16 --- a/src/cmd/go/internal/envcmd/env.go
17 +++ b/src/cmd/go/internal/envcmd/env.go
18 @@ -85,11 +85,11 @@ func MkEnv() []cfg.EnvVar {
20 cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)
21 if env := strings.Fields(os.Getenv("CC")); len(env) > 0 {
23 + cc = strings.Join(env, " ")
25 cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)
26 if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 {
28 + cxx = strings.Join(env, " ")
30 env = append(env, cfg.EnvVar{Name: "CC", Value: cc})
31 env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx})