Added
Link Here
|
1 |
--- vendor/golang.org/x/tools/internal/testenv/testenv.go.orig 2025-05-08 09:30:00 UTC |
2 |
+++ vendor/golang.org/x/tools/internal/testenv/testenv.go |
3 |
@@ -115,7 +115,7 @@ func HasTool(tool string) error { |
4 |
checkGoBuild.err = err |
5 |
return |
6 |
} |
7 |
- cmd := exec.Command("go", "build", "-o", os.DevNull, mainGo) |
8 |
+ cmd := exec.Command("%%GO_CMD%%", "build", "-o", os.DevNull, mainGo) |
9 |
cmd.Dir = dir |
10 |
if out, err := cmd.CombinedOutput(); err != nil { |
11 |
if len(out) > 0 { |
12 |
@@ -145,7 +145,7 @@ func cgoEnabled(bypassEnvironment bool) (bool, error) |
13 |
} |
14 |
|
15 |
func cgoEnabled(bypassEnvironment bool) (bool, error) { |
16 |
- cmd := exec.Command("go", "env", "CGO_ENABLED") |
17 |
+ cmd := exec.Command("%%GO_CMD%%", "env", "CGO_ENABLED") |
18 |
if bypassEnvironment { |
19 |
cmd.Env = append(append([]string(nil), os.Environ()...), "CGO_ENABLED=") |
20 |
} |
21 |
@@ -444,7 +444,7 @@ func findGOROOT() (string, error) { |
22 |
return |
23 |
} |
24 |
|
25 |
- cmd := exec.Command("go", "env", "GOROOT") |
26 |
+ cmd := exec.Command("%%GO_CMD%%", "env", "GOROOT") |
27 |
out, err := cmd.Output() |
28 |
if err != nil { |
29 |
gorootErr = fmt.Errorf("%v: %v", cmd, err) |
30 |
@@ -480,7 +480,7 @@ func NeedsLocalXTools(t testing.TB) { |
31 |
|
32 |
NeedsTool(t, "go") |
33 |
|
34 |
- cmd := Command(t, "go", "list", "-f", "{{with .Replace}}{{.Dir}}{{end}}", "-m", "golang.org/x/tools") |
35 |
+ cmd := Command(t, "%%GO_CMD%%", "list", "-f", "{{with .Replace}}{{.Dir}}{{end}}", "-m", "golang.org/x/tools") |
36 |
out, err := cmd.Output() |
37 |
if err != nil { |
38 |
if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 { |