diff options
Diffstat (limited to 'meta/recipes-devtools/go/go-1.6/gotooldir.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.6/gotooldir.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-devtools/go/go-1.6/gotooldir.patch b/meta/recipes-devtools/go/go-1.6/gotooldir.patch deleted file mode 100644 index 94670259f2..0000000000 --- a/meta/recipes-devtools/go/go-1.6/gotooldir.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Define tooldir in relation to GOTOOLDIR env var | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Pending | ||
5 | Index: go/src/go/build/build.go | ||
6 | =================================================================== | ||
7 | --- go.orig/src/go/build/build.go | ||
8 | +++ go/src/go/build/build.go | ||
9 | @@ -1388,7 +1388,7 @@ func init() { | ||
10 | } | ||
11 | |||
12 | // ToolDir is the directory containing build tools. | ||
13 | -var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) | ||
14 | +var ToolDir = envOr("GOTOOLDIR", filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)) | ||
15 | |||
16 | // IsLocalImport reports whether the import path is | ||
17 | // a local import path, like ".", "..", "./foo", or "../foo". | ||
18 | Index: go/src/cmd/go/build.go | ||
19 | =================================================================== | ||
20 | --- go.orig/src/cmd/go/build.go | ||
21 | +++ go/src/cmd/go/build.go | ||
22 | @@ -1312,7 +1312,7 @@ func (b *builder) build(a *action) (err | ||
23 | } | ||
24 | |||
25 | cgoExe := tool("cgo") | ||
26 | - if a.cgo != nil && a.cgo.target != "" { | ||
27 | + if a.cgo != nil && a.cgo.target != "" && os.Getenv("GOTOOLDIR") == "" { | ||
28 | cgoExe = a.cgo.target | ||
29 | } | ||
30 | outGo, outObj, err := b.cgo(a.p, cgoExe, obj, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, cxxfiles, a.p.MFiles) | ||