build: put GOPATH in /tmp on launchpad (#20564)

* build: put GOPATH in /tmp on launchpad

* build: don't remove GOPATH from go tool environment
This commit is contained in:
Felix Lange
2020-01-16 12:03:41 +01:00
committed by Péter Szilágyi
parent f20c8d495a
commit 3e97b04a3d
2 changed files with 4 additions and 2 deletions

View File

@ -297,7 +297,7 @@ func goToolArch(arch string, cc string, subcmd string, args ...string) *exec.Cmd
cmd.Env = append(cmd.Env, "CC="+cc)
}
for _, e := range os.Environ() {
if strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "GOBIN=") {
if strings.HasPrefix(e, "GOBIN=") {
continue
}
cmd.Env = append(cmd.Env, e)