mirror of
https://github.com/golang/go
synced 2024-11-12 00:20:22 -07:00
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>
This commit is contained in:
parent
f549af6f0a
commit
578e066862
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user