diff options
Diffstat (limited to 'meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch new file mode 100644 index 0000000000..3bb33b0146 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 7a7de46129fa6859fb6311096eb9f54c53c7fe2f 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 1/9] allow CC and CXX to have multiple words | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Signed-off-by: Matt Madison <matt@madison.systems> | ||
9 | --- | ||
10 | src/cmd/go/internal/envcmd/env.go | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go | ||
14 | index 603f7b5060..f891123f9c 100644 | ||
15 | --- a/src/cmd/go/internal/envcmd/env.go | ||
16 | +++ b/src/cmd/go/internal/envcmd/env.go | ||
17 | @@ -82,11 +82,11 @@ func MkEnv() []cfg.EnvVar { | ||
18 | |||
19 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) | ||
20 | if env := strings.Fields(os.Getenv("CC")); len(env) > 0 { | ||
21 | - cc = env[0] | ||
22 | + cc = strings.Join(env, " ") | ||
23 | } | ||
24 | cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch) | ||
25 | if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 { | ||
26 | - cxx = env[0] | ||
27 | + cxx = strings.Join(env, " ") | ||
28 | } | ||
29 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) | ||
30 | env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx}) | ||
31 | -- | ||
32 | 2.14.1 | ||
33 | |||