diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
| commit | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (patch) | |
| tree | 4449f2036cccf162e8417cc5841a35815b3e7ac5 /src/cmd/api | |
| parent | c8bf49ef8a92e2337b69c14b9b88396efe498600 (diff) | |
| download | golang-upstream/1.3.tar.gz | |
Imported Upstream version 1.3upstream/1.3
Diffstat (limited to 'src/cmd/api')
| -rw-r--r-- | src/cmd/api/goapi.go | 2 | ||||
| -rw-r--r-- | src/cmd/api/run.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go index a62c87421..4bde794a1 100644 --- a/src/cmd/api/goapi.go +++ b/src/cmd/api/goapi.go @@ -817,7 +817,7 @@ func (w *Walker) emitFunc(f *types.Func) { func (w *Walker) emitMethod(m *types.Selection) { sig := m.Type().(*types.Signature) recv := sig.Recv().Type() - // report exported methods with unexported reveiver base type + // report exported methods with unexported receiver base type if true { base := recv if p, _ := recv.(*types.Pointer); p != nil { 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 { |