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 945dbfb7f7274f52caa63c8ad84d65ab0936c2dc..1b2335806f4fb424049c6b8c75a2fa145c9a0e98 100644 (file)
--- 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)