From cdc5356c938446fa6b237c54c2c6d5e5d5f267c0 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 11 Sep 2013 14:42:34 -0400 Subject: [PATCH] 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 --- src/cmd/api/goapi.go | 4 ++++ 1 file changed, 4 insertions(+) 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)) } } -- 2.50.0