diff options
| author | Bryan C. Mills <bcmills@google.com> | 2023-04-14 16:48:26 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-04-24 18:46:00 +0000 |
| commit | 484535e67b03ff8c757b66806032aee54a2a3bde (patch) | |
| tree | 35f4ec82e038b6fad1408d271a31d03293e19632 | |
| parent | 813a811d3308c82cfc5b739321a5eb973612a990 (diff) | |
| download | go-git-484535e67b03ff8c757b66806032aee54a2a3bde.tar.gz | |
cmd/compile/internal/importer,go/internal/gcimporter: use the 'go' command from build.Default.GOROOT in lookupGorootExport
Also set GOROOT explicitly in case it is set to something else in the
caller's environment.
Updates #59598.
Fixes #59637.
Change-Id: I5599ed1183b23187fc3b976786f3c320d42ef4f3
Reviewed-on: https://go-review.googlesource.com/c/go/+/484756
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
(cherry picked from commit 750e91152bbd1cb2869660ddb80f2b3adcfd1f9b)
Reviewed-on: https://go-review.googlesource.com/c/go/+/484758
Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
| -rw-r--r-- | src/cmd/compile/internal/importer/gcimporter.go | 3 | ||||
| -rw-r--r-- | src/go/internal/gcimporter/gcimporter.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/importer/gcimporter.go b/src/cmd/compile/internal/importer/gcimporter.go index 5d948f03c8..490cdf94df 100644 --- a/src/cmd/compile/internal/importer/gcimporter.go +++ b/src/cmd/compile/internal/importer/gcimporter.go @@ -39,8 +39,9 @@ func lookupGorootExport(pkgDir string) (string, bool) { ) f, _ = exportMap.LoadOrStore(pkgDir, func() (string, bool) { listOnce.Do(func() { - cmd := exec.Command("go", "list", "-export", "-f", "{{.Export}}", pkgDir) + cmd := exec.Command(filepath.Join(build.Default.GOROOT, "bin", "go"), "list", "-export", "-f", "{{.Export}}", pkgDir) cmd.Dir = build.Default.GOROOT + cmd.Env = append(os.Environ(), "PWD="+cmd.Dir, "GOROOT="+build.Default.GOROOT) var output []byte output, err := cmd.Output() if err != nil { diff --git a/src/go/internal/gcimporter/gcimporter.go b/src/go/internal/gcimporter/gcimporter.go index 2140a9f98c..284389aae7 100644 --- a/src/go/internal/gcimporter/gcimporter.go +++ b/src/go/internal/gcimporter/gcimporter.go @@ -42,8 +42,9 @@ func lookupGorootExport(pkgDir string) (string, bool) { ) f, _ = exportMap.LoadOrStore(pkgDir, func() (string, bool) { listOnce.Do(func() { - cmd := exec.Command("go", "list", "-export", "-f", "{{.Export}}", pkgDir) + cmd := exec.Command(filepath.Join(build.Default.GOROOT, "bin", "go"), "list", "-export", "-f", "{{.Export}}", pkgDir) cmd.Dir = build.Default.GOROOT + cmd.Env = append(cmd.Environ(), "GOROOT="+build.Default.GOROOT) var output []byte output, err := cmd.Output() if err != nil { |