new

qiulaidongfeng · qiulaidongfeng · commit c2cea5542b6f · 2024-09-07T15:42:38.000+08:00
Change-Id: I412bac099822116d691ef73159e3625de501a0cd
diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
@@ -142,8 +142,10 @@ func bootstrapBuildTools() {
 	_, after, _ := strings.Cut(ver, "go1")
 	if after != "" {
 		v := strings.Split(after, ".")
-		if len(v) > 2 {
-			if v[0] < minBootStrapVersion[1] || v[1] < minBootStrapVersion[2] {
+		// if go version output is go1.22.6 goos/goarch
+		// v is ["","22","6 goos/aoarch"].
+		if len(v) == 3 {
+			if v[1] < minBootStrapVersion[1] || strings.Split(v[2], " ")[0] < minBootStrapVersion[2] {
 				fatalf("requires Go 1.%s.%s or later for bootstrap", minBootStrapVersion[1], minBootStrapVersion[2])
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,10 @@ func bootstrapBuildTools() {`
`142`	`142`	`_, after, _ := strings.Cut(ver, "go1")`
`143`	`143`	`if after != "" {`
`144`	`144`	`v := strings.Split(after, ".")`
`145`		`- if len(v) > 2 {`
`146`		`- if v[0] < minBootStrapVersion[1] \|\| v[1] < minBootStrapVersion[2] {`
	`145`	`+ // if go version output is go1.22.6 goos/goarch`
	`146`	`+ // v is ["","22","6 goos/aoarch"].`
	`147`	`+ if len(v) == 3 {`
	`148`	`+ if v[1] < minBootStrapVersion[1] \|\| strings.Split(v[2], " ")[0] < minBootStrapVersion[2] {`
`147`	`149`	`fatalf("requires Go 1.%s.%s or later for bootstrap", minBootStrapVersion[1], minBootStrapVersion[2])`
`148`	`150`	`}`
`149`	`151`	`}`