code review 5645093: cmd/dist: cross-compiling fixes

src/cmd/go/tool.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 (
         "fmt"
         "go/build"
         "os"
@@ skipping 13 matching lines @@
 With no arguments it prints the list of known tools.
 
 For more about each tool command, see 'go tool command -h'.
 `,
 }
 
 var (
         toolGOOS      = runtime.GOOS
         toolGOARCH    = runtime.GOARCH
         toolIsWindows = toolGOOS == "windows"
-        toolDir       = filepath.Join(build.Path[0].Path, "bin", "tool", toolGOOS+"_"+toolGOARCH)
+        toolDir       = build.ToolDir
 )
 
 const toolWindowsExtension = ".exe"
 
 func tool(name string) string {
         p := filepath.Join(toolDir, name)
         if toolIsWindows {
                 p += toolWindowsExtension
         }
         return p
@@ skipping 57 matching lines @@
         for _, name := range names {
                 // Unify presentation by going to lower case.
                 name = strings.ToLower(name)
                 // If it's windows, don't show the .exe suffix.
                 if toolIsWindows && strings.HasSuffix(name, toolWindowsExtension) {
                         name = name[:len(name)-len(toolWindowsExtension)]
                 }
                 fmt.Println(name)
         }
 }