From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Thu, 1 Mar 2012 23:13:04 +0000 (-0300)
Subject: cmd/go: fix -I flag for gc command
X-Git-Tag: weekly.2012-03-04~46
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=04450d8a26406f46f2fc6659469b872ce0b85579;p=gostls13.git

cmd/go: fix -I flag for gc command

R=rsc, remyoudompheng
CC=golang-dev
https://golang.org/cl/5711056
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 945dbfb7f7..1b2335806f 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -791,7 +791,9 @@ func (b *builder) includeArgs(flag string, all []*action) []string {
 	for _, a1 := range all {
 		if dir := a1.pkgdir; dir == a1.p.build.PkgRoot && !incMap[dir] {
 			if _, ok := buildToolchain.(gccgoToolchain); ok {
-				dir = filepath.Join(filepath.Dir(dir), "gccgo", filepath.Base(dir))
+				dir = filepath.Join(dir, "gccgo")
+			} else {
+				dir = filepath.Join(dir, goos+"_"+goarch)
 			}
 			incMap[dir] = true
 			inc = append(inc, flag, dir)