cmd/api: ensure GOPATH always points to the correct go.tools

R=golang-codereviews, dave, bradfitz
CC=golang-codereviews
https://golang.org/cl/51000043

diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go
index 1e10dc600ca91d7a06e79b55cf8b097d670bc6ac..ede8ac99ccb82d8506754db7f9115514aae81937 100644 (file)
--- a/src/cmd/api/run.go
+++ b/src/cmd/api/run.go
@@ -46,7 +46,7 @@ func main() {
        gopath := prepGoPath()
 
        cmd := exec.Command("go", "install", "--tags=api_tool", "cmd/api")
-       cmd.Env = append([]string{"GOPATH=" + gopath}, filterOut(os.Environ(), "GOARCH")...)
+       cmd.Env = append(filterOut(os.Environ(), "GOARCH", "GOPATH"), "GOPATH="+gopath)
        out, err := cmd.CombinedOutput()
        if err != nil {
                log.Fatalf("Error installing cmd/api: %v\n%s", err, out)