summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch')
-rw-r--r--meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
index 001c94a4e7..7e86d8cd6b 100644
--- a/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
+++ b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
@@ -1,7 +1,7 @@
1From e3f9a8a69d3a340c1a1d0bba566e71f20f635a43 Mon Sep 17 00:00:00 2001 1From fdad9a0ea659cf2281a0df16b0f69f179605ec9a Mon Sep 17 00:00:00 2001
2From: Alex Kube <alexander.j.kube@gmail.com> 2From: Alex Kube <alexander.j.kube@gmail.com>
3Date: Wed, 23 Oct 2019 21:15:37 +0430 3Date: Wed, 23 Oct 2019 21:15:37 +0430
4Subject: [PATCH 2/9] cmd/go: Allow GOTOOLDIR to be overridden in the 4Subject: [PATCH 02/11] cmd/go: Allow GOTOOLDIR to be overridden in the
5 environment 5 environment
6 6
7to allow for split host/target build roots 7to allow for split host/target build roots
@@ -20,10 +20,10 @@ Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
20 2 files changed, 8 insertions(+), 2 deletions(-) 20 2 files changed, 8 insertions(+), 2 deletions(-)
21 21
22diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go 22diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
23index 32e59b446a..06ee4de8a9 100644 23index 1f467647f5..b62e518030 100644
24--- a/src/cmd/dist/build.go 24--- a/src/cmd/dist/build.go
25+++ b/src/cmd/dist/build.go 25+++ b/src/cmd/dist/build.go
26@@ -259,7 +259,9 @@ func xinit() { 26@@ -280,7 +280,9 @@ func xinit() {
27 } 27 }
28 xatexit(rmworkdir) 28 xatexit(rmworkdir)
29 29
@@ -35,10 +35,10 @@ index 32e59b446a..06ee4de8a9 100644
35 goversion := findgoversion() 35 goversion := findgoversion()
36 isRelease = strings.HasPrefix(goversion, "release.") || strings.HasPrefix(goversion, "go") 36 isRelease = strings.HasPrefix(goversion, "release.") || strings.HasPrefix(goversion, "go")
37diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go 37diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
38index a8daa2dfc3..393ada39c9 100644 38index 3b9f27e91d..ec043c1530 100644
39--- a/src/cmd/go/internal/cfg/cfg.go 39--- a/src/cmd/go/internal/cfg/cfg.go
40+++ b/src/cmd/go/internal/cfg/cfg.go 40+++ b/src/cmd/go/internal/cfg/cfg.go
41@@ -230,7 +230,11 @@ func SetGOROOT(goroot string, isTestGo bool) { 41@@ -248,7 +248,11 @@ func SetGOROOT(goroot string, isTestGo bool) {
42 // This matches the initialization of ToolDir in go/build, except for 42 // This matches the initialization of ToolDir in go/build, except for
43 // using ctxt.GOROOT and the installed GOOS and GOARCH rather than the 43 // using ctxt.GOROOT and the installed GOOS and GOARCH rather than the
44 // GOROOT, GOOS, and GOARCH reported by the runtime package. 44 // GOROOT, GOOS, and GOARCH reported by the runtime package.
@@ -52,5 +52,5 @@ index a8daa2dfc3..393ada39c9 100644
52 } 52 }
53 } 53 }
54-- 54--
552.44.0 552.25.1
56 56