Merge pull request #2250 from visualfc/go1.24

make: go.work for go1.24

Author: xushiwei

cmd/_make/1.24/go.work

@@ -0,0 +1,5 @@
+go 1.24
+
+use ./../../../
+
+replace golang.org/x/tools => golang.org/x/tools v0.30.0

cmd/_make/1.24/go.work.sum

@@ -0,0 +1,11 @@
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=

cmd/make.go

@@ -353,14 +353,7 @@ func buildGoplusTools(useGoProxy bool) {
 
 	switch goVersion() {
 	case "1.24":
-		os.Chdir(gopBinPath)
-		work := filepath.Join(gopBinPath, "go.work")
-		err := os.WriteFile(work, []byte(workfile), 0644)
-		if err != nil {
-			log.Fatalln(err)
-		}
-		defer os.Remove(work)
-		defer os.Remove(filepath.Join(gopBinPath, "go.work.sum"))
+		work := filepath.Join(commandsDir, "_make", "1.24", "go.work")
 		commandExecuteEnv = append(commandExecuteEnv,
 			"GOWORK="+work)
 	}