From 671862747ef238f1713170f712e85d1cd6d46685 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 27 Mar 2012 11:16:10 -0400 Subject: [PATCH] go/build: fix import check When we find a package in DIR/src/foo, we only let it be known as foo if there is no other foo in an earlier GOPATH directory or the GOROOT directory. The GOROOT check was looking in GOROOT/src/foo instead of GOROOT/src/pkg/foo, which meant that the import paths "lib9", "libbio", "libmach", and so on were unavailable, and the import paths "math", "errors", and so on were available. Correct this. Fixes #3390. R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/5927050 --- src/pkg/go/build/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkg/go/build/build.go b/src/pkg/go/build/build.go index 1c7c47231f..d749aef151 100644 --- a/src/pkg/go/build/build.go +++ b/src/pkg/go/build/build.go @@ -387,7 +387,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa // but check that using it wouldn't find something // else first. if ctxt.GOROOT != "" { - if dir := ctxt.joinPath(ctxt.GOROOT, "src", sub); ctxt.isDir(dir) { + if dir := ctxt.joinPath(ctxt.GOROOT, "src", "pkg", sub); ctxt.isDir(dir) { goto Found } } -- 2.50.0