tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-17 19:23:25 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

loader: respect $GOROOT when running go list

Browse Source 
This makes it possible to select the Go version using GOROOT, and works
even if the `go` binary is not in $PATH.
This commit is contained in:
Ayke van Laethem
2022-01-19 13:11:38 +01:00
committed by Nia
parent e7e1b755c9
commit d054d4d512
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/list.go
+3 -1
View File
@@ -3,9 +3,11 @@ package loader
import ( import (
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
"github.com/tinygo-org/tinygo/compileopts" "github.com/tinygo-org/tinygo/compileopts"
"github.com/tinygo-org/tinygo/goenv"
) )
// List returns a ready-to-run *exec.Cmd for running the `go list` command with // List returns a ready-to-run *exec.Cmd for running the `go list` command with
@@ -24,7 +26,7 @@ func List(config *compileopts.Config, extraArgs, pkgs []string) (*exec.Cmd, erro
if config.CgoEnabled() { if config.CgoEnabled() {
cgoEnabled = "1" cgoEnabled = "1"
} }
cmd := exec.Command("go", args...) cmd := exec.Command(filepath.Join(goenv.Get("GOROOT"), "bin", "go"), args...)
cmd.Env = append(os.Environ(), "GOROOT="+goroot, "GOOS="+config.GOOS(), "GOARCH="+config.GOARCH(), "CGO_ENABLED="+cgoEnabled) cmd.Env = append(os.Environ(), "GOROOT="+goroot, "GOOS="+config.GOOS(), "GOARCH="+config.GOARCH(), "CGO_ENABLED="+cgoEnabled)
return cmd, nil return cmd, nil
} }