code review 5595044: cmd/go: add go tools to rearrangement

src/cmd/go/pkg.go

 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
         "go/build"
         "os"
         "path/filepath"
@@ skipping 206 matching lines @@
                                 b = append(b, ' ')
                         }
                 default:
                         space = false
                         b = append(b, c)
                 }
         }
         return string(b)
 }
 
+// isGoTool is the list of directories for Go programs that are installed in
+// $GOROOT/bin/go-tool.
+var isGoTool = map[string]bool{
+        "cmd/fix":  true,
+        "cmd/vet":  true,
+        "cmd/yacc": true,
+}
+
 func scanPackage(ctxt *build.Context, t *build.Tree, arg, importPath, dir string, stk *importStack) *Package {
         // Read the files in the directory to learn the structure
         // of the package.
         p := &Package{
                 ImportPath: importPath,
                 Dir:        dir,
                 Standard:   t.Goroot && !strings.Contains(importPath, "."),
                 t:          t,
         }
         packageCache[dir] = p
@@ skipping 18 matching lines @@
         p.XTestGoFiles = info.XTestGoFiles
         p.CFiles = info.CFiles
         p.HFiles = info.HFiles
         p.SFiles = info.SFiles
         p.CgoFiles = info.CgoFiles
         p.CgoCFLAGS = info.CgoCFLAGS
         p.CgoLDFLAGS = info.CgoLDFLAGS
 
         if info.Package == "main" {
                 _, elem := filepath.Split(importPath)
-                p.target = filepath.Join(t.BinDir(), elem)
+                if t.Goroot && isGoTool[p.ImportPath] {
+                        p.target = filepath.Join(t.Path, "bin/go-tool", elem)
+                } else {
+                        p.target = filepath.Join(t.BinDir(), elem)
+                }
                 if ctxt.GOOS == "windows" {
                         p.target += ".exe"
                 }
         } else {
                 p.target = filepath.Join(t.PkgDir(), filepath.FromSlash(importPath)+".a")
         }
 
         // For gccgo, rewrite p.target with the expected library name. We won't do
         // that for the standard library for the moment.
         if !p.Standard {
@@ skipping 170 matching lines @@
                         // Only print each once.
                         if !printed[err] {
                                 printed[err] = true
                                 errorf("%s", err)
                         }
                 }
         }
         exitIfErrors()
         return pkgs
 }