cmd/go: use correct paths with race detector

Currently the build fails with -race if a package in GOPATH
imports another package in GOPATH.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6811083

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index e9e25bc31d63fb82cb7e26a3609085670e92b96d..78d7c907bdb7e4f0835e033ff03647c2108b27ab 100644 (file)
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -876,6 +876,9 @@ func (b *builder) includeArgs(flag string, all []*action) []string {
                                dir = filepath.Join(dir, "gccgo")
                        } else {
                                dir = filepath.Join(dir, goos+"_"+goarch)
+                               if buildRace {
+                                       dir += "_race"
+                               }
                        }
                        inc = append(inc, flag, dir)
                }