diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/dist/build.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index b724d16456..e5d4b2458a 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -235,13 +235,6 @@ func xinit() { // make.bash really does start from a clean slate. os.Setenv("GOCACHE", pathf("%s/pkg/obj/go-build", goroot)) - // Set GOPATH to an internal directory. We shouldn't actually - // need to store files here, since the toolchain won't - // depend on modules outside of vendor directories, but if - // GOPATH points somewhere else (e.g., to GOROOT), the - // go tool may complain. - os.Setenv("GOPATH", pathf("%s/pkg/obj/gopath", goroot)) - // Make the environment more predictable. os.Setenv("LANG", "C") os.Setenv("LANGUAGE", "en_US.UTF8") @@ -1211,6 +1204,13 @@ func cmdbootstrap() { xflagparse(0) + // Set GOPATH to an internal directory. We shouldn't actually + // need to store files here, since the toolchain won't + // depend on modules outside of vendor directories, but if + // GOPATH points somewhere else (e.g., to GOROOT), the + // go tool may complain. + os.Setenv("GOPATH", pathf("%s/pkg/obj/gopath", goroot)) + if debug { // cmd/buildid is used in debug mode. toolchain = append(toolchain, "cmd/buildid") |