From 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Thu, 19 Jun 2014 09:22:53 +0200 Subject: Imported Upstream version 1.3 --- src/cmd/api/run.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cmd/api/run.go') diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go index 1e10dc600..896b2b4a1 100644 --- a/src/cmd/api/run.go +++ b/src/cmd/api/run.go @@ -46,14 +46,14 @@ 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) } out, err = exec.Command("go", "tool", "api", - "-c", file("go1", "go1.1", "go1.2"), + "-c", file("go1", "go1.1", "go1.2", "go1.3"), "-next", file("next"), "-except", file("except")).CombinedOutput() if err != nil { -- cgit v1.2.3