From: Rémy Oudompheng <oudomphe@phare.normalesup.org>
Date: Fri, 2 Mar 2012 16:31:13 +0000 (-0500)
Subject: cmd/go: avoid repeated include dirs.
X-Git-Tag: weekly.2012-03-04~31
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1feecdd633c1943e5c4a0ced3a14788ee00f343c;p=gostls13.git

cmd/go: avoid repeated include dirs.

Fixes #3171.

R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/5724045
---

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)
 		}
 	}