Skip to content

Commit d574061

Browse files
new
Change-Id: I888c0c8d3d7614547b53938c5440894b84a75cbe
1 parent ea5c927 commit d574061

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/cmd/dist/buildtool.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,13 @@ func bootstrapBuildTools() {
138138

139139
// check bootstrap version.
140140
ver := run(pathf("%s/bin", goroot_bootstrap), CheckExit, pathf("%s/bin/go", goroot_bootstrap), "version")
141-
// if go1.22.6,
142-
// go version output go version 1.22.6 goos/aoarch,
143-
// so split(ver," ")[2].
144-
ver = strings.Split(ver, " ")[2]
141+
// go version output like go version 1.22.6 goos/aoarch,
142+
// or go version devel go1.24-b44ca2cd85.
143+
vers := strings.Split(ver, " ")
144+
ver = vers[2]
145+
if vers[2] == "devel" {
146+
ver = vers[3]
147+
}
145148
if version.Compare(ver, tryDirs[1]) == -1 {
146149
fatalf("requires %s or later for bootstrap", tryDirs[1])
147150
}

0 commit comments

Comments
 (0)