diff options
| author | Russ Cox <rsc@golang.org> | 2013-09-11 14:42:34 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-09-11 14:42:34 -0400 |
| commit | cdc5356c938446fa6b237c54c2c6d5e5d5f267c0 (patch) | |
| tree | eaa408a30c6c751ee0a53a6fd07f54807dc60c5d /src/cmd/api/goapi.go | |
| parent | 6624b708660460600041bf7391e4f03b13b6edef (diff) | |
| download | go-git-cdc5356c938446fa6b237c54c2c6d5e5d5f267c0.tar.gz | |
cmd/api: fix tool for recent go/build change
Asking about runtime/cgo when CgoEnabled=false now correctly
returns an error from build.Import (specifically, NoGoError), because
there are no buildable Go files in that directory.
The API tool was depending on it returning a package with no Go
files instead. Correct that assumption.
Fixes all.bash on local machines.
(Dashboard appears not to be running the api tool at all.)
Update #6124
TBR=golang-dev
CC=golang-dev
https://golang.org/cl/13385046
Diffstat (limited to 'src/cmd/api/goapi.go')
| -rw-r--r-- | src/cmd/api/goapi.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go index 7102e9d409..a62c874210 100644 --- a/src/cmd/api/goapi.go +++ b/src/cmd/api/goapi.go @@ -145,6 +145,10 @@ func main() { // going to change w/o a language change. // - We don't care about the API of commands. if name != "unsafe" && !strings.HasPrefix(name, "cmd/") { + if name == "runtime/cgo" && !context.CgoEnabled { + // w.Import(name) will return nil + continue + } w.export(w.Import(name)) } } |