qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 12:17:56 -07:00
Code Releases Activity

cmd/go: avoid repeated include dirs.

Browse Source 
Fixes #3171.

R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/5724045
This commit is contained in:
Rémy Oudompheng 2012-03-02 11:31:13 -05:00 committed by Russ Cox
parent 4d7d3f5328
commit 1feecdd633
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/go/build.go
View File

@ -790,12 +790,12 @@ func (b *builder) includeArgs(flag string, all []*action) []string {
// Finally, look in the installed package directories for each action. // Finally, look in the installed package directories for each action.
for _, a1 := range all { for _, a1 := range all {
if dir := a1.pkgdir; dir == a1.p.build.PkgRoot && !incMap[dir] { if dir := a1.pkgdir; dir == a1.p.build.PkgRoot && !incMap[dir] {
incMap[dir] = true
if _, ok := buildToolchain.(gccgoToolchain); ok { if _, ok := buildToolchain.(gccgoToolchain); ok {
dir = filepath.Join(dir, "gccgo") dir = filepath.Join(dir, "gccgo")
} else { } else {
dir = filepath.Join(dir, goos+"_"+goarch) dir = filepath.Join(dir, goos+"_"+goarch)
} }
incMap[dir] = true
inc = append(inc, flag, dir) inc = append(inc, flag, dir)
} }
} }