diff options
| -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 { |