Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 7e0136a882757da0a374ab8592209586eced0e1c Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 2 | From: Alex Kube <alexander.j.kube@gmail.com> |
| 3 | Date: Wed, 23 Oct 2019 21:15:37 +0430 |
| 4 | Subject: [PATCH] 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 | --- |
| 17 | src/cmd/dist/build.go | 4 +++- |
| 18 | src/cmd/go/internal/cfg/cfg.go | 6 +++++- |
| 19 | 2 files changed, 8 insertions(+), 2 deletions(-) |
| 20 | |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 21 | diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go |
| 22 | index 7c44c4a..3024d0c 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 23 | --- a/src/cmd/dist/build.go |
| 24 | +++ b/src/cmd/dist/build.go |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 25 | @@ -264,7 +264,9 @@ func xinit() { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 26 | } |
| 27 | xatexit(rmworkdir) |
| 28 | |
| 29 | - tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) |
| 30 | + if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { |
| 31 | + tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) |
| 32 | + } |
| 33 | } |
| 34 | |
| 35 | // compilerEnv returns a map from "goos/goarch" to the |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 36 | diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go |
| 37 | index c6ddfe5..605adb1 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 38 | --- a/src/cmd/go/internal/cfg/cfg.go |
| 39 | +++ b/src/cmd/go/internal/cfg/cfg.go |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 40 | @@ -162,7 +162,11 @@ func SetGOROOT(goroot string) { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 41 | // variables. This matches the initialization of ToolDir in |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 42 | // go/build, except for using BuildContext.GOROOT rather than |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 43 | // runtime.GOROOT. |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 44 | - build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 45 | + if s := os.Getenv("GOTOOLDIR"); s != "" { |
| 46 | + build.ToolDir = filepath.Clean(s) |
| 47 | + } else { |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 48 | + build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 49 | + } |
| 50 | } |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 51 | } |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 52 | |