From: Russ Cox <rsc@golang.org>
Date: Wed, 11 Sep 2013 18:42:34 +0000 (-0400)
Subject: cmd/api: fix tool for recent go/build change
X-Git-Tag: go1.2rc2~254
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cdc5356c938446fa6b237c54c2c6d5e5d5f267c0;p=gostls13.git

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
---

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))
 			}
 		}