Commit b44fb4c3 by Ian Lance Taylor

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

From-SVN: r219406
parent adfac8df
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment