1 files changed, 33 insertions, 0 deletions

diff --git a/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch
new file mode 100644
index 0000000000..5f4823be22
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch
@@ -0,0 +1,33 @@
+From 9e3dc44cdfa58d96504d0a789dc82617dd5bef55 Mon Sep 17 00:00:00 2001
+From: Alex Kube <alexander.j.kube@gmail.com>
+Date: Wed, 23 Oct 2019 21:01:13 +0430
+Subject: [PATCH 1/9] cmd/go: Allow CC and CXX to have multiple words
+
+Upstream-Status: Inappropriate [OE specific]
+
+Adapted to Go 1.13 from patches originally submitted to
+the meta/recipes-devtools/go tree by
+Matt Madison <matt@madison.systems>.
+
+Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
+
+---
+ src/cmd/go/internal/envcmd/env.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/cmd/go/internal/envcmd/env.go
++++ b/src/cmd/go/internal/envcmd/env.go
+@@ -103,11 +103,11 @@ func MkEnv() []cfg.EnvVar {
+ 
+        cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)
+        if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 {
+-               cc = env[0]
++               cc = strings.Join(env, " ")
+        }
+        cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)
+        if env := strings.Fields(cfg.Getenv("CXX")); len(env) > 0 {
+-               cxx = env[0]
++               cxx = strings.Join(env, " ")
+        }
+        env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")})
+        env = append(env, cfg.EnvVar{Name: "CC", Value: cc})