cmd/go: Adjust finding gccgo to match current upstream sources.

From-SVN: r219406

diff --git a/libgo/go/cmd/go/build.go b/libgo/go/cmd/go/build.go
index 8de7627611844f4620bbb08bc6c726d1bfa6f8bf..36216cea40449dd00f6b9975a06f3aa4987f05ed 100644 (file)
--- a/libgo/go/cmd/go/build.go
+++ b/libgo/go/cmd/go/build.go
@@ -1783,15 +1783,22 @@ func (gcToolchain) cc(b *builder, p *Package, objdir, ofile, cfile string) error
 // The Gccgo toolchain.
 type gccgoToolchain struct{}
 
-func (gccgoToolchain) compiler() string {
-       if v := os.Getenv("GOC"); v != "" {
-               return v
+var gccgoName, gccgoBin string
+
+func init() {
+       gccgoName = os.Getenv("GCCGO")
+       if gccgoName == "" {
+               gccgoName = defaultGCCGO
        }
-       return defaultGOC
+       gccgoBin, _ = exec.LookPath(gccgoName)
+}
+
+func (gccgoToolchain) compiler() string {
+       return gccgoBin
 }
 
-func (tools gccgoToolchain) linker() string {
-       return tools.compiler()
+func (gccgoToolchain) linker() string {
+       return gccgoBin
 }
 
 func (tools gccgoToolchain) gc(b *builder, p *Package, archive, obj string, importArgs []string, gofiles []string) (ofile string, output []byte, err error) {