cmd/go: skip _obj directories in package scans

Fixes #2693

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5557057

diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index 8ef6395f4f71a3ab71866e4124e3fec1071ac819..fdea80916f5335183e60f4d5a997cfbbb4da43f3 100644 (file)
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -327,9 +327,9 @@ func allPackages(pattern string) []string {
                                return nil
                        }
 
-                       // Avoid .foo and testdata directory trees.
+                       // Avoid .foo, _foo, and testdata directory trees.
                        _, elem := filepath.Split(path)
-                       if strings.HasPrefix(elem, ".") || elem == "testdata" {
+                       if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" {
                                return filepath.SkipDir
                        }
 
@@ -394,9 +394,9 @@ func allPackagesInFS(pattern string) []string {
                        return nil
                }
 
-               // Avoid .foo and testdata directory trees.
+               // Avoid .foo, _foo, and testdata directory trees.
                _, elem := filepath.Split(path)
-               if strings.HasPrefix(elem, ".") || elem == "testdata" {
+               if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" {
                        return filepath.SkipDir
                }