git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

From-SVN: r219406
This commit is contained in:
Ian Lance Taylor 2015-01-09 21:18:04 +00:00
parent adfac8dfed
commit b44fb4c37a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libgo/go/cmd/go/build.go
View File

@ -1783,15 +1783,22 @@ func (gcToolchain) cc(b *builder, p *Package, objdir, ofile, cfile string) error
// The Gccgo toolchain. // The Gccgo toolchain.
type gccgoToolchain struct{} type gccgoToolchain struct{}
func (gccgoToolchain) compiler() string { var gccgoName, gccgoBin string
if v := os.Getenv("GOC"); v != "" {
return v func init() {
gccgoName = os.Getenv("GCCGO")
if gccgoName == "" {
gccgoName = defaultGCCGO
} }
return defaultGOC gccgoBin, _ = exec.LookPath(gccgoName)
} }
func (tools gccgoToolchain) linker() string { func (gccgoToolchain) compiler() string {
return tools.compiler() return gccgoBin
}
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) { func (tools gccgoToolchain) gc(b *builder, p *Package, archive, obj string, importArgs []string, gofiles []string) (ofile string, output []byte, err error) {