diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-08-07 22:47:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 22:47:58 +0800 |
| commit | f5925b045945824c4a128b01551ecece37bc1a95 (patch) | |
| tree | bc1e0e590d85b60acfd836775ee12cbccd90727f /build/ci.go | |
| parent | 67439c1dbaa72f62c86d9a776cb01add2d6f3b9b (diff) | |
| parent | f59a49d591e3311b030b57d2be488a6303a3747a (diff) | |
| download | dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar.gz dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar.bz2 dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar.lz dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar.xz dexon-f5925b045945824c4a128b01551ecece37bc1a95.tar.zst dexon-f5925b045945824c4a128b01551ecece37bc1a95.zip | |
Merge pull request #14928 from fjl/build-goroot-explain
internal/build: add GoTool and document why it uses GOROOT
Diffstat (limited to 'build/ci.go')
| -rw-r--r-- | build/ci.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/build/ci.go b/build/ci.go index e631d70ef..6fe03db71 100644 --- a/build/ci.go +++ b/build/ci.go @@ -250,10 +250,7 @@ func goTool(subcmd string, args ...string) *exec.Cmd { } func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd { - gocmd := filepath.Join(runtime.GOROOT(), "bin", "go") - cmd := exec.Command(gocmd, subcmd) - cmd.Args = append(cmd.Args, args...) - + cmd := build.GoTool(subcmd, args...) if subcmd == "build" || subcmd == "install" || subcmd == "test" { // Go CGO has a Windows linker error prior to 1.8 (https://github.com/golang/go/issues/8756). // Work around issue by allowing multiple definitions for <1.8 builds. |