diff options
| author | Matt Madison <matt@madison.systems> | 2017-09-13 14:54:10 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-14 11:35:46 +0100 |
| commit | 41c51dc28e881f8a12c62725a4d823db804a5cb1 (patch) | |
| tree | 247fcae541237ec3afbf2a323442d34f622f0536 /meta/recipes-devtools/go/go-1.8/gotooldir.patch | |
| parent | e6542356b461b510f913eecd3850c075764acc3a (diff) | |
| download | poky-41c51dc28e881f8a12c62725a4d823db804a5cb1.tar.gz | |
go: update to go 1.9
* Rebased patches
- dropped armhf-elf patch, should no longer be needed
- dropped syslog patch which should not have been imported to begin with
- reworked other patches as needed for the updated code base
* Updated native, cross, cross-canadian .inc files to
remove some testdata directories that contain .a files
that strip chokes on during sysroot staging
(From OE-Core rev: f2ccf56778433ec16f44eecaa10a610a6630df50)
Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.8/gotooldir.patch')
| -rw-r--r-- | meta/recipes-devtools/go/go-1.8/gotooldir.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-devtools/go/go-1.8/gotooldir.patch b/meta/recipes-devtools/go/go-1.8/gotooldir.patch deleted file mode 100644 index 94670259f2..0000000000 --- a/meta/recipes-devtools/go/go-1.8/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) | ||
