go/build: use GOBIN as binary path for GOROOT

Fixes #2106.

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

diff --git a/src/pkg/go/build/path.go b/src/pkg/go/build/path.go
index 7c120d064cb0ae1514f59ac0b6637c3a5fd9bedb..e39b5f8fa575e2f70bc21cb03bc50cfe1f4a353c 100644 (file)
--- a/src/pkg/go/build/path.go
+++ b/src/pkg/go/build/path.go
@@ -54,6 +54,11 @@ func (t *Tree) PkgDir() string {
 
 // BinDir returns the tree's binary executable directory.
 func (t *Tree) BinDir() string {
+       if t.Goroot {
+               if gobin := os.Getenv("GOBIN"); gobin != "" {
+                       return gobin
+               }
+       }
        return filepath.Join(t.Path, "bin")
 }