summaryrefslogtreecommitdiff
path: root/src/run.rc
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2022-04-05 14:25:34 -0400
committerBryan Mills <bcmills@google.com>2022-04-05 21:45:19 +0000
commit69756b38f25bf72f1040dd7fd243febba89017e6 (patch)
tree54fc0ed6abf02e62db9266961cf5c2f855e98a44 /src/run.rc
parent5a6a830c1ceafd551937876f11590fd60aea1799 (diff)
downloadgo-git-69756b38f25bf72f1040dd7fd243febba89017e6.tar.gz
cmd/dist: move more environment logic into cmd/dist from make and run scripts
'go tool dist env' outputs different (and fewer) environment variables than 'go env'. The 'go tool dist env' variables should be authoritative, whereas many printed by 'go env' are merely informational (and not intended to be overridden in the actual environment). Fixes #52009 Change-Id: Ic0590153875183135cebf7ca55ead7c2b4038569 Reviewed-on: https://go-review.googlesource.com/c/go/+/398061 Trust: Bryan Mills <bcmills@google.com> Run-TryBot: Bryan Mills <bcmills@google.com> Reviewed-by: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/run.rc')
-rwxr-xr-xsrc/run.rc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/run.rc b/src/run.rc
index a7b4801207..2a0bb7f7a1 100755
--- a/src/run.rc
+++ b/src/run.rc
@@ -10,11 +10,7 @@ if(! test -f ../bin/go){
exit wrongdir
}
-eval `{../bin/go env}
+eval `{../bin/go tool dist env}
GOPATH=/nonexist-gopath
-GOBIN=() # Issue 14340
-GOFLAGS=()
-GO111MODULE=()
-
exec ../bin/go tool dist test -rebuild $*