diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-27 23:39:18 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-29 12:54:12 +0100 |
commit | f6c34549f6d852937f5de3a81d0cedfed11d5ae4 (patch) | |
tree | b2c3013deb4ee77876023c649281f1b6d27ac292 /meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |
parent | 1d06897aba605c570cbd261fa38d5f0e11c3a850 (diff) | |
download | poky-f6c34549f6d852937f5de3a81d0cedfed11d5ae4.tar.gz |
Remove Go 1.11
There doesn't seem to be a reason to keep it in addition to 1.12 now.
(From OE-Core rev: 03bfbbb1d86f102ce23ee6ac0d4b905fc241f23c)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch deleted file mode 100644 index 4442858c83..0000000000 --- a/meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
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 | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Signed-off-by: Matt Madison <matt@madison.systems> | ||
9 | |||
10 | --- | ||
11 | src/cmd/go/internal/envcmd/env.go | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
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 { | ||
19 | |||
20 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) | ||
21 | if env := strings.Fields(os.Getenv("CC")); len(env) > 0 { | ||
22 | - cc = env[0] | ||
23 | + cc = strings.Join(env, " ") | ||
24 | } | ||
25 | cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch) | ||
26 | if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 { | ||
27 | - cxx = env[0] | ||
28 | + cxx = strings.Join(env, " ") | ||
29 | } | ||
30 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) | ||
31 | env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx}) | ||