diff options
| author | Russ Cox <rsc@golang.org> | 2021-12-06 13:36:42 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2021-12-07 18:58:57 +0000 |
| commit | 4300f105147dc0da9d1034704ad1cd24bedde5da (patch) | |
| tree | 6049cf053d260d5982bca9b3236018b83b4ff931 /src/make.rc | |
| parent | a08bbd964dd037331b2693aff731ec2d8376a721 (diff) | |
| download | go-4300f105147dc0da9d1034704ad1cd24bedde5da.tar.gz go-4300f105147dc0da9d1034704ad1cd24bedde5da.zip | |
build: for default bootstrap, use Go 1.17 if present, falling back to Go 1.4
Preparation for #44505, but safe for Go 1.18.
Also fixes the default build on Macs, at least for
people who have a $HOME/go1.17 or have run
go install golang.org/dl/go1.17@latest
go1.17 download
Change-Id: I822f93e75498620fad87db2436376148c42f6bff
Reviewed-on: https://go-review.googlesource.com/c/go/+/369914
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/make.rc')
| -rwxr-xr-x | src/make.rc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/make.rc b/src/make.rc index ba8c5db2d9..37087d6357 100755 --- a/src/make.rc +++ b/src/make.rc @@ -55,6 +55,9 @@ goroot_bootstrap_set = 'true' if(! ~ $#GOROOT_BOOTSTRAP 1){ goroot_bootstrap_set = 'false' GOROOT_BOOTSTRAP = $home/go1.4 + for(d in sdk/go1.17 go1.17) + if(test -d $home/$d) + GOROOT_BOOTSTRAP = $home/$d } for(p in $path){ if(! test -x $GOROOT_BOOTSTRAP/bin/go){ |