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>

diff --git a/src/make.bash b/src/make.bash
index 4ea5a9a8b5aadcc6f65b8ac22151ea536d383e80..a28b82a05881ffabda6c606fb0a596c7f74ec198 100755 (executable)
--- 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