diff options
| author | Russ Cox <rsc@golang.org> | 2022-10-05 21:13:08 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2022-10-17 19:46:59 +0000 |
| commit | 07c57aff5d6d8f1df96eb99507bd04c57d0616ca (patch) | |
| tree | 5c40fb691db99e17741f7ad85a86773b542f01bb /src/make.bash | |
| parent | b65e259e56a326295250f037efbd31f64bcdfbfe (diff) | |
| download | go-07c57aff5d6d8f1df96eb99507bd04c57d0616ca.tar.xz | |
all: use Go 1.17.13 for bootstrap
Previously we used Go 1.17, but we realized thanks to tickling
a pre-Go1.17.3 bug that if we are going to change the bootstrap
toolchain that we should default to the latest available point release
at the time we make the switch, not the initial major release, so as
to avoid bugs that were fixed in the point releases.
This CL updates the default search locations and the release notes.
Users who run make.bash and depend on finding $HOME/sdk/go1.17
may need to run
go install golang.org/dl/go1.17.13@latest
go1.17.13 download
to provide a Go 1.17.13 toolchain to their builds.
Change-Id: I3a2511f088cf852470a7216a5a41ae775fb561b6
Reviewed-on: https://go-review.googlesource.com/c/go/+/439419
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/make.bash b/src/make.bash index 4616502cec..c07f39bb40 100755 --- a/src/make.bash +++ b/src/make.bash @@ -67,13 +67,15 @@ # timing information to this file. Useful for profiling where the # time goes when these scripts run. # -# GOROOT_BOOTSTRAP: A working Go tree >= Go 1.17 for bootstrap. +# GOROOT_BOOTSTRAP: A working Go tree >= Go 1.17.13 for bootstrap. # If $GOROOT_BOOTSTRAP/bin/go is missing, $(go env GOROOT) is -# tried for all "go" in $PATH. By default, one of $HOME/go1.17, -# $HOME/sdk/go1.17, or $HOME/go1.4, whichever exists, in that order. +# tried for all "go" in $PATH. By default, one of $HOME/go1.17.13, +# $HOME/sdk/go1.17.13, or $HOME/go1.4, whichever exists, in that order. # We still check $HOME/go1.4 to allow for build scripts that still hard-code # that name even though they put newer Go toolchains there. +bootgo=1.17.13 + set -e if [ ! -f run.bash ]; then @@ -152,7 +154,7 @@ 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 + for d in sdk/go$bootgo go$bootgo; do if [ -d "$HOME/$d" ]; then GOROOT_BOOTSTRAP="$HOME/$d" fi @@ -175,7 +177,7 @@ IFS=$'\n'; for go_exe in $(type -ap go); do done; unset IFS if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2 - echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.17." >&2 + echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go $bootgo." >&2 exit 1 fi # Get the exact bootstrap toolchain version to help with debugging. @@ -188,7 +190,7 @@ if $verbose; then fi if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then echo "ERROR: \$GOROOT_BOOTSTRAP must not be set to \$GOROOT" >&2 - echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.17." >&2 + echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go $bootgo." >&2 exit 1 fi rm -f cmd/dist/dist |