diff options
| author | Rémy Oudompheng <oudomphe@phare.normalesup.org> | 2012-03-02 11:31:13 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2012-03-02 11:31:13 -0500 |
| commit | 1feecdd633c1943e5c4a0ced3a14788ee00f343c (patch) | |
| tree | 938b5c1193e42fb9efa69ebc8ef3ed2601b6e094 | |
| parent | 4d7d3f532896e70489bae7c9dc54ca88ccef91bc (diff) | |
| download | go-1feecdd633c1943e5c4a0ced3a14788ee00f343c.tar.gz go-1feecdd633c1943e5c4a0ced3a14788ee00f343c.zip | |
cmd/go: avoid repeated include dirs.
Fixes #3171.
R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/5724045
| -rw-r--r-- | src/cmd/go/build.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go index d14278acbc..382f61e89b 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go @@ -790,12 +790,12 @@ func (b *builder) includeArgs(flag string, all []*action) []string { // Finally, look in the installed package directories for each action. for _, a1 := range all { if dir := a1.pkgdir; dir == a1.p.build.PkgRoot && !incMap[dir] { + incMap[dir] = true if _, ok := buildToolchain.(gccgoToolchain); ok { dir = filepath.Join(dir, "gccgo") } else { dir = filepath.Join(dir, goos+"_"+goarch) } - incMap[dir] = true inc = append(inc, flag, dir) } } |