diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-02-23 20:13:18 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-26 15:21:20 +0000 |
commit | cedb3aa8173a9443fec5adee8419d2f505bc304c (patch) | |
tree | 2a2f9e7b7c05bc063487253b30248fa9df727794 /meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch | |
parent | 510406ddf54613b691cd59efa12f70848b5101b5 (diff) | |
download | poky-cedb3aa8173a9443fec5adee8419d2f505bc304c.tar.gz |
go: Upgrade compiler to 1.16 major release
Revert a CC/CXX check [1] which wont work with OE settings
Forward port needed patches forward
Details releaase notes are here [2]
[1] https://go-review.googlesource.com/c/go/+/228517/
[2] https://golang.org/doc/go1.16
(From OE-Core rev: 5c41c6ed4e2e70d18b32c460b8c8e1aadd54584f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch')
-rw-r--r-- | meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch deleted file mode 100644 index 662c705471..0000000000 --- a/meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 28ada8896b76d620240bafc22aa395071d601482 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kube <alexander.j.kube@gmail.com> | ||
3 | Date: Wed, 23 Oct 2019 21:15:37 +0430 | ||
4 | Subject: [PATCH 3/9] cmd/go: Allow GOTOOLDIR to be overridden in the environment | ||
5 | |||
6 | to allow for split host/target build roots | ||
7 | |||
8 | Adapted to Go 1.13 from patches originally submitted to | ||
9 | the meta/recipes-devtools/go tree by | ||
10 | Matt Madison <matt@madison.systems>. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | ||
15 | --- | ||
16 | src/cmd/dist/build.go | 4 +++- | ||
17 | src/cmd/go/internal/cfg/cfg.go | 6 +++++- | ||
18 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
19 | |||
20 | --- a/src/cmd/dist/build.go | ||
21 | +++ b/src/cmd/dist/build.go | ||
22 | @@ -246,7 +246,9 @@ func xinit() { | ||
23 | workdir = xworkdir() | ||
24 | xatexit(rmworkdir) | ||
25 | |||
26 | - tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) | ||
27 | + if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { | ||
28 | + tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) | ||
29 | + } | ||
30 | } | ||
31 | |||
32 | // compilerEnv returns a map from "goos/goarch" to the | ||
33 | --- a/src/cmd/go/internal/cfg/cfg.go | ||
34 | +++ b/src/cmd/go/internal/cfg/cfg.go | ||
35 | @@ -64,7 +64,11 @@ func defaultContext() build.Context { | ||
36 | // variables. This matches the initialization of ToolDir in | ||
37 | // go/build, except for using ctxt.GOROOT rather than | ||
38 | // runtime.GOROOT. | ||
39 | - build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) | ||
40 | + if s := os.Getenv("GOTOOLDIR"); s != "" { | ||
41 | + build.ToolDir = filepath.Clean(s) | ||
42 | + } else { | ||
43 | + build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) | ||
44 | + } | ||
45 | } | ||
46 | |||
47 | ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) | ||