From 78eadc87df453c2a325fd9762d57e3232179b631 Mon Sep 17 00:00:00 2001
From: Mateusz Poliwczak <mpoliwczak34@gmail.com>
Date: Sun, 26 May 2024 18:27:53 +0000
Subject: make.bash: preserve GOROOT_BOOTSTRAP

CL 582076 made the GOROOT_BOOTSTRAP set to "", which in turn
causes the next iteration to return true. "$GOROOT_BOOTSTRAP/bin/go"
becomes "/bin/go", which always exists.

Fixes #67654

Change-Id: I290bd4a7defc58e4b34d5bf955ef4f34569ff0ed
GitHub-Last-Rev: 9c7134fa44874b0a9d03807aa583b1088cc13922
GitHub-Pull-Request: golang/go#67655
Reviewed-on: https://go-review.googlesource.com/c/go/+/588436
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
---
 src/make.bash | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/make.bash')

diff --git a/src/make.bash b/src/make.bash
index 5b49fcccf7..814b7e87e1 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -166,8 +166,10 @@ bootstrapenv() {
 export GOROOT="$(cd .. && pwd)"
 IFS=$'\n'; for go_exe in $(type -ap go); do
 	if [[ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]]; then
+		goroot_bootstrap=$GOROOT_BOOTSTRAP
 		GOROOT_BOOTSTRAP=""
 		goroot=$(bootstrapenv "$go_exe" env GOROOT)
+		GOROOT_BOOTSTRAP=$goroot_bootstrap
 		if [[ "$goroot" != "$GOROOT" ]]; then
 			if [[ "$goroot_bootstrap_set" == "true" ]]; then
 				printf 'WARNING: %s does not exist, found %s from env\n' "$GOROOT_BOOTSTRAP/bin/go" "$go_exe" >&2
-- 
cgit v1.3-5-g9baa