aboutsummaryrefslogtreecommitdiff
path: root/src/make.bash
diff options
context:
space:
mode:
authorLE Manh Cuong <cuong.manhle.vn@gmail.com>2018-06-20 11:22:37 +0700
committerBrad Fitzpatrick <bradfitz@golang.org>2018-06-20 16:04:33 +0000
commit578e0668627229ad0b9a3c88b61b3489cedb9074 (patch)
treeabf8d4adf9774d55431bc82fa217aad50964a62f /src/make.bash
parentf549af6f0a79479dddc70593291c31401b1f495a (diff)
downloadgo-578e0668627229ad0b9a3c88b61b3489cedb9074.tar.gz
go-578e0668627229ad0b9a3c88b61b3489cedb9074.zip
make.bash: don't pass GOOS and GOARCH to cmd/go when finding GOROOT_BOOTSTRAP
Fixes #25962 Change-Id: I10d41713f6aef100d7b2c8c976f22d1c8ac376d5 Reviewed-on: https://go-review.googlesource.com/119937 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/make.bash')
-rwxr-xr-xsrc/make.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash
index 4ea5a9a8b5..a28b82a058 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -141,7 +141,7 @@ export GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
export GOROOT="$(cd .. && pwd)"
IFS=$'\n'; for go_exe in $(type -ap go); do
if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
- goroot=$(GOROOT='' "$go_exe" env GOROOT)
+ goroot=$(GOROOT='' GOOS='' GOARCH='' "$go_exe" env GOROOT)
if [ "$goroot" != "$GOROOT" ]; then
GOROOT_BOOTSTRAP=$goroot
fi