diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-02-27 00:05:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-28 23:11:29 +0000 |
commit | 12477b74e57b93e5735a98ba82264f6fc9c09cbd (patch) | |
tree | 668568540e7fba1b4fc84e7907b06d2958b4a6cb /meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |
parent | cfd64145801580898a179f1d235512d4b5917379 (diff) | |
download | poky-12477b74e57b93e5735a98ba82264f6fc9c09cbd.tar.gz |
go: Update to 1.14 release series
(From OE-Core rev: 3daa9684e458b9c926e1a07acd9b1c0fe8bd2e86)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/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.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch new file mode 100644 index 0000000000..d47664d8e2 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |||
@@ -0,0 +1,33 @@ | |||
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 | --- a/src/cmd/go/internal/envcmd/env.go | ||
19 | +++ b/src/cmd/go/internal/envcmd/env.go | ||
20 | @@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { | ||
21 | |||
22 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) | ||
23 | if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { | ||
24 | - cc = env[0] | ||
25 | + cc = strings.Join(env, " ") | ||
26 | } | ||
27 | cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch) | ||
28 | if env := strings.Fields(cfg.Getenv("CXX")); len(env) > 0 { | ||
29 | - cxx = env[0] | ||
30 | + cxx = strings.Join(env, " ") | ||
31 | } | ||
32 | env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) | ||
33 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) | ||