53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
|
From 8512964c0bfdfc3c9c3805743ea7de551a1d476a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alex Kube <alexander.j.kube@gmail.com>
|
||
|
|
Date: Wed, 23 Oct 2019 21:15:37 +0430
|
||
|
|
Subject: [PATCH] cmd/go: Allow GOTOOLDIR to be overridden in the environment
|
||
|
|
|
||
|
|
to allow for split host/target build roots
|
||
|
|
|
||
|
|
Adapted to Go 1.13 from patches originally submitted to
|
||
|
|
the meta/recipes-devtools/go tree by
|
||
|
|
Matt Madison <matt@madison.systems>.
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate [OE specific]
|
||
|
|
|
||
|
|
Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
src/cmd/dist/build.go | 4 +++-
|
||
|
|
src/cmd/go/internal/cfg/cfg.go | 6 +++++-
|
||
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
|
||
|
|
index bec1769..d82f612 100644
|
||
|
|
--- a/src/cmd/dist/build.go
|
||
|
|
+++ b/src/cmd/dist/build.go
|
||
|
|
@@ -248,7 +248,9 @@ func xinit() {
|
||
|
|
}
|
||
|
|
xatexit(rmworkdir)
|
||
|
|
|
||
|
|
- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
|
||
|
|
+ if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {
|
||
|
|
+ tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
// compilerEnv returns a map from "goos/goarch" to the
|
||
|
|
diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
|
||
|
|
index 57a3c1f..825d8c7 100644
|
||
|
|
--- a/src/cmd/go/internal/cfg/cfg.go
|
||
|
|
+++ b/src/cmd/go/internal/cfg/cfg.go
|
||
|
|
@@ -67,7 +67,11 @@ func defaultContext() build.Context {
|
||
|
|
// variables. This matches the initialization of ToolDir in
|
||
|
|
// go/build, except for using ctxt.GOROOT rather than
|
||
|
|
// runtime.GOROOT.
|
||
|
|
- build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
||
|
|
+ if s := os.Getenv("GOTOOLDIR"); s != "" {
|
||
|
|
+ build.ToolDir = filepath.Clean(s)
|
||
|
|
+ } else {
|
||
|
|
+ build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH)
|