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/cmd/dist | |
| 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/cmd/dist')
| -rw-r--r-- | src/cmd/dist/buildtool.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index 75f04a975c..17538ad5a4 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -93,10 +93,21 @@ var ignoreSuffixes = []string{ "_test.go", } +var tryDirs = []string{ + "sdk/go1.17", + "go1.17", +} + func bootstrapBuildTools() { goroot_bootstrap := os.Getenv("GOROOT_BOOTSTRAP") if goroot_bootstrap == "" { - goroot_bootstrap = pathf("%s/go1.4", os.Getenv("HOME")) + home := os.Getenv("HOME") + goroot_bootstrap = pathf("%s/go1.4", home) + for _, d := range tryDirs { + if p := pathf("%s/%s", home, d); isdir(p) { + goroot_bootstrap = p + } + } } xprintf("Building Go toolchain1 using %s.\n", goroot_bootstrap) |