From 7a7de46129fa6859fb6311096eb9f54c53c7fe2f Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Mon, 19 Feb 2018 08:49:33 -0800 Subject: [PATCH 1/9] allow CC and CXX to have multiple words Upstream-Status: Inappropriate [OE specific] Signed-off-by: Matt Madison --- src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go index 603f7b5060..f891123f9c 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -82,11 +82,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(os.Getenv("CC")); len(env) > 0 { - cc = env[0] + cc = strings.Join(env, " ") } cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch) if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 { - cxx = env[0] + cxx = strings.Join(env, " ") } env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx}) -- 2.14.1