Merge pull request #1232 from makiuchi-d/fix-build-failed-with-go1.21.0

nevkontakte · web-flow · commit 67d465fd7f04 · 2023-09-02T11:07:36.000+01:00
Avoid build failures with Go 1.21.0 installed in the environment.
diff --git a/build/context.go b/build/context.go
@@ -179,7 +179,7 @@ func (sc simpleCtx) gotool(subcommand string, args ...string) (string, error) {
 		panic(fmt.Errorf("can't use go tool with a virtual build context"))
 	}
 	args = append([]string{subcommand}, args...)
-	cmd := exec.Command("go", args...)
+	cmd := exec.Command(filepath.Join(sc.bctx.GOROOT, "bin", "go"), args...)
 
 	if sc.bctx.Dir != "" {
 		cmd.Dir = sc.bctx.Dir

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (sc simpleCtx) gotool(subcommand string, args ...string) (string, error) {`
`179`	`179`	`panic(fmt.Errorf("can't use go tool with a virtual build context"))`
`180`	`180`	`}`
`181`	`181`	`args = append([]string{subcommand}, args...)`
`182`		`- cmd := exec.Command("go", args...)`
	`182`	`+ cmd := exec.Command(filepath.Join(sc.bctx.GOROOT, "bin", "go"), args...)`
`183`	`183`
`184`	`184`	`if sc.bctx.Dir != "" {`
`185`	`185`	`cmd.Dir = sc.bctx.Dir`