From 34573aeb9717cf20d768e640c263b294df5318a4 Mon Sep 17 00:00:00 2001
From: Michael Pratt <mpratt@google.com>
Date: Tue, 7 Dec 2021 22:51:46 +0000
Subject: Revert "build: for default bootstrap, use Go 1.17 if present, falling
 back to Go 1.4"

This reverts https://golang.org/cl/369914.

Reason for revert: Breaking previously working toolchain builds.

For #44505.

Change-Id: I09ae20e50109a600d036358118077d27669df39c
Reviewed-on: https://go-review.googlesource.com/c/go/+/370138
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Trust: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---
 src/make.bash | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/make.bash')

diff --git a/src/make.bash b/src/make.bash
index 2d6c47272e..3310692a18 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -153,14 +153,7 @@ if [ "$1" = "-v" ]; then
 fi
 
 goroot_bootstrap_set=${GOROOT_BOOTSTRAP+"true"}
-if [ -z "$GOROOT_BOOTSTRAP" ]; then
-	GOROOT_BOOTSTRAP="$HOME/go1.4"
-	for d in sdk/go1.17 go1.17; do
-		if [ -d "$HOME/$d" ]; then
-			GOROOT_BOOTSTRAP="$HOME/$d"
-		fi
-	done
-fi
+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
-- 
cgit v1.3