diff options
| author | Bryan C. Mills <bcmills@google.com> | 2022-04-05 14:25:34 -0400 |
|---|---|---|
| committer | Bryan Mills <bcmills@google.com> | 2022-04-05 21:45:19 +0000 |
| commit | 69756b38f25bf72f1040dd7fd243febba89017e6 (patch) | |
| tree | 54fc0ed6abf02e62db9266961cf5c2f855e98a44 /src/make.bat | |
| parent | 5a6a830c1ceafd551937876f11590fd60aea1799 (diff) | |
| download | go-69756b38f25bf72f1040dd7fd243febba89017e6.tar.gz go-69756b38f25bf72f1040dd7fd243febba89017e6.zip | |
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/make.bat')
| -rw-r--r-- | src/make.bat | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/make.bat b/src/make.bat index c2f87ace75..0ba2dd57c5 100644 --- a/src/make.bat +++ b/src/make.bat @@ -46,11 +46,7 @@ if x%4==x--no-local goto nolocal setlocal
:nolocal
-set GOENV=off
-set GOWORK=off
set GOBUILDFAIL=0
-set GOFLAGS=
-set GO111MODULE=
if exist make.bat goto ok
echo Must run make.bat from Go src directory.
@@ -102,6 +98,8 @@ set GOARCH= set GOBIN=
set GOEXPERIMENT=
set GO111MODULE=off
+set GOENV=off
+set GOFLAGS=
"%GOROOT_BOOTSTRAP%\bin\go.exe" build -o cmd\dist\dist.exe .\cmd\dist
endlocal
if errorlevel 1 goto fail
|