diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/dist/README | 15 | ||||
| -rw-r--r-- | src/cmd/dist/buildtool.go | 2 | ||||
| -rw-r--r-- | src/cmd/dist/notgo124.go (renamed from src/cmd/dist/notgo122.go) | 12 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/cmd/dist/README b/src/cmd/dist/README index 78a6d42d0a..d600520040 100644 --- a/src/cmd/dist/README +++ b/src/cmd/dist/README @@ -4,18 +4,17 @@ As of Go 1.5, dist and other parts of the compiler toolchain are written in Go, making bootstrapping a little more involved than in the past. The approach is to build the current release of Go with an earlier one. -The process to install Go 1.x, for x ≥ 24, is: +The process to install Go 1.x, for x ≥ 26, is: -1. Build cmd/dist with Go 1.22.6. -2. Using dist, build Go 1.x compiler toolchain with Go 1.22.6. +1. Build cmd/dist with Go 1.24.6. +2. Using dist, build Go 1.x compiler toolchain with Go 1.24.6. 3. Using dist, rebuild Go 1.x compiler toolchain with itself. 4. Using dist, build Go 1.x cmd/go (as go_bootstrap) with Go 1.x compiler toolchain. 5. Using go_bootstrap, build the remaining Go 1.x standard library and commands. -Because of backward compatibility, although the steps above say Go 1.22.6, -in practice any release ≥ Go 1.22.6 but < Go 1.x will work as the bootstrap base. +Because of backward compatibility, although the steps above say Go 1.24.6, +in practice any release ≥ Go 1.24.6 but < Go 1.x will work as the bootstrap base. Releases ≥ Go 1.x are very likely to work as well. -See https://go.dev/s/go15bootstrap for more details about the original bootstrap -and https://go.dev/issue/54265 for details about later bootstrap version bumps. - +See go.dev/s/go15bootstrap for more details about the original bootstrap +and go.dev/issue/54265 for details about later bootstrap version bumps. diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index 013b769b90..b7e5891981 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -121,7 +121,7 @@ var ignoreSuffixes = []string{ "~", } -const minBootstrap = "go1.22.6" +const minBootstrap = "go1.24.6" var tryDirs = []string{ "sdk/" + minBootstrap, diff --git a/src/cmd/dist/notgo122.go b/src/cmd/dist/notgo124.go index 229a26e757..dc6ef4d8bd 100644 --- a/src/cmd/dist/notgo122.go +++ b/src/cmd/dist/notgo124.go @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Go 1.24 and later requires Go 1.22.6 as the bootstrap toolchain. +// Go 1.26 and later requires Go 1.24.6 as the minimum bootstrap toolchain. // If cmd/dist is built using an earlier Go version, this file will be // included in the build and cause an error like: // // % GOROOT_BOOTSTRAP=$HOME/sdk/go1.16 ./make.bash // Building Go cmd/dist using /Users/rsc/sdk/go1.16. (go1.16 darwin/amd64) -// found packages main (build.go) and building_Go_requires_Go_1_22_6_or_later (notgo122.go) in /Users/rsc/go/src/cmd/dist +// found packages main (build.go) and building_Go_requires_Go_1_24_6_or_later (notgo124.go) in /Users/rsc/go/src/cmd/dist // % // // which is the best we can do under the circumstances. // -// See go.dev/issue/44505 for more background on -// why Go moved on from Go 1.4 for bootstrap. +// See go.dev/issue/44505 and go.dev/issue/54265 for more +// background on why Go moved on from Go 1.4 for bootstrap. -//go:build !go1.22 +//go:build !go1.24 -package building_Go_requires_Go_1_22_6_or_later +package building_Go_requires_Go_1_24_6_or_later |