aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/api')
-rw-r--r--src/cmd/api/goapi.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 01b6defb5f..5d1cf05e31 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -428,10 +428,15 @@ func (w *Walker) Import(name string) (*types.Package, error) {
}
w.imported[name] = &importing
+ root := w.root
+ if strings.HasPrefix(name, "golang.org/x/") {
+ root = filepath.Join(root, "vendor")
+ }
+
// Determine package files.
- dir := filepath.Join(w.root, filepath.FromSlash(name))
+ dir := filepath.Join(root, filepath.FromSlash(name))
if fi, err := os.Stat(dir); err != nil || !fi.IsDir() {
- log.Fatalf("no source in tree for package %q", pkg)
+ log.Fatalf("no source in tree for import %q: %v", name, err)
}
context := w.context