diff options
Diffstat (limited to 'meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch new file mode 100644 index 0000000000..ddfd5e41d1 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 9e3dc44cdfa58d96504d0a789dc82617dd5bef55 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kube <alexander.j.kube@gmail.com> | ||
3 | Date: Wed, 23 Oct 2019 21:01:13 +0430 | ||
4 | Subject: [PATCH 1/9] cmd/go: Allow CC and CXX to have multiple words | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Adapted to Go 1.13 from patches originally submitted to | ||
9 | the meta/recipes-devtools/go tree by | ||
10 | Matt Madison <matt@madison.systems>. | ||
11 | |||
12 | Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | ||
13 | |||
14 | --- | ||
15 | src/cmd/go/internal/envcmd/env.go | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go | ||
19 | index 17852de..7b5ec5e 100644 | ||
20 | --- a/src/cmd/go/internal/envcmd/env.go | ||
21 | +++ b/src/cmd/go/internal/envcmd/env.go | ||
22 | @@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { | ||
23 | |||
24 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) | ||
25 | if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { | ||
26 | - cc = env[0] | ||
27 | + cc = strings.Join(env, " ") | ||
28 | } | ||
29 | cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch) | ||
30 | if env := strings.Fields(cfg.Getenv("CXX")); len(env) > 0 { | ||
31 | - cxx = env[0] | ||
32 | + cxx = strings.Join(env, " ") | ||
33 | } | ||
34 | env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) | ||
35 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) | ||
36 | -- | ||
37 | 2.17.1 (Apple Git-112) | ||
38 | |||