diff options
Diffstat (limited to 'meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch b/meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch deleted file mode 100644 index 983323ace9..0000000000 --- a/meta/recipes-devtools/go/go-1.6/fix-cc-handling.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Accept CC with multiple words in its name | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Pending | ||
5 | Index: go/src/cmd/go/build.go | ||
6 | =================================================================== | ||
7 | --- go.orig/src/cmd/go/build.go 2015-07-29 14:48:40.323185807 -0700 | ||
8 | +++ go/src/cmd/go/build.go 2015-07-30 07:37:40.529818586 -0700 | ||
9 | @@ -2805,12 +2805,24 @@ | ||
10 | return b.ccompilerCmd("CC", defaultCC, objdir) | ||
11 | } | ||
12 | |||
13 | +// gccCmd returns a gcc command line prefix | ||
14 | +// defaultCC is defined in zdefaultcc.go, written by cmd/dist. | ||
15 | +func (b *builder) gccCmdForReal() []string { | ||
16 | + return envList("CC", defaultCC) | ||
17 | +} | ||
18 | + | ||
19 | // gxxCmd returns a g++ command line prefix | ||
20 | // defaultCXX is defined in zdefaultcc.go, written by cmd/dist. | ||
21 | func (b *builder) gxxCmd(objdir string) []string { | ||
22 | return b.ccompilerCmd("CXX", defaultCXX, objdir) | ||
23 | } | ||
24 | |||
25 | +// gxxCmd returns a g++ command line prefix | ||
26 | +// defaultCXX is defined in zdefaultcc.go, written by cmd/dist. | ||
27 | +func (b *builder) gxxCmdForReal() []string { | ||
28 | + return envList("CXX", defaultCXX) | ||
29 | +} | ||
30 | + | ||
31 | // ccompilerCmd returns a command line prefix for the given environment | ||
32 | // variable and using the default command when the variable is empty. | ||
33 | func (b *builder) ccompilerCmd(envvar, defcmd, objdir string) []string { | ||
34 | Index: go/src/cmd/go/env.go | ||
35 | =================================================================== | ||
36 | --- go.orig/src/cmd/go/env.go 2015-07-29 14:48:40.323185807 -0700 | ||
37 | +++ go/src/cmd/go/env.go 2015-07-30 07:40:54.461655721 -0700 | ||
38 | @@ -52,10 +52,9 @@ | ||
39 | |||
40 | if goos != "plan9" { | ||
41 | cmd := b.gccCmd(".") | ||
42 | - env = append(env, envVar{"CC", cmd[0]}) | ||
43 | + env = append(env, envVar{"CC", strings.Join(b.gccCmdForReal(), " ")}) | ||
44 | env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")}) | ||
45 | - cmd = b.gxxCmd(".") | ||
46 | - env = append(env, envVar{"CXX", cmd[0]}) | ||
47 | + env = append(env, envVar{"CXX", strings.Join(b.gxxCmdForReal(), " ")}) | ||
48 | } | ||
49 | |||
50 | if buildContext.CgoEnabled { | ||