1*4882a593SmuzhiyunFrom 9e3dc44cdfa58d96504d0a789dc82617dd5bef55 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Alex Kube <alexander.j.kube@gmail.com>
3*4882a593SmuzhiyunDate: Wed, 23 Oct 2019 21:01:13 +0430
4*4882a593SmuzhiyunSubject: [PATCH 1/9] cmd/go: Allow CC and CXX to have multiple words
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunUpstream-Status: Inappropriate [OE specific]
7*4882a593Smuzhiyun
8*4882a593SmuzhiyunAdapted to Go 1.13 from patches originally submitted to
9*4882a593Smuzhiyunthe meta/recipes-devtools/go tree by
10*4882a593SmuzhiyunMatt Madison <matt@madison.systems>.
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunSigned-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
13*4882a593Smuzhiyun
14*4882a593Smuzhiyun---
15*4882a593Smuzhiyun src/cmd/go/internal/envcmd/env.go | 4 ++--
16*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-)
17*4882a593Smuzhiyun
18*4882a593Smuzhiyun--- a/src/cmd/go/internal/envcmd/env.go
19*4882a593Smuzhiyun+++ b/src/cmd/go/internal/envcmd/env.go
20*4882a593Smuzhiyun@@ -103,11 +103,11 @@ func MkEnv() []cfg.EnvVar {
21*4882a593Smuzhiyun
22*4882a593Smuzhiyun 	cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)
23*4882a593Smuzhiyun 	if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 {
24*4882a593Smuzhiyun-		cc = env[0]
25*4882a593Smuzhiyun+		cc = strings.Join(env, " ")
26*4882a593Smuzhiyun 	}
27*4882a593Smuzhiyun 	cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)
28*4882a593Smuzhiyun 	if env := strings.Fields(cfg.Getenv("CXX")); len(env) > 0 {
29*4882a593Smuzhiyun-		cxx = env[0]
30*4882a593Smuzhiyun+		cxx = strings.Join(env, " ")
31*4882a593Smuzhiyun 	}
32*4882a593Smuzhiyun 	env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")})
33*4882a593Smuzhiyun 	env = append(env, cfg.EnvVar{Name: "CC", Value: cc})
34