diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2012-03-01 20:13:04 -0300 |
|---|---|---|
| committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2012-03-01 20:13:04 -0300 |
| commit | 04450d8a26406f46f2fc6659469b872ce0b85579 (patch) | |
| tree | adb01297b12e22e4215c00a33bb8014f862905d8 | |
| parent | 7c6654aa7024609b81c3d8dc7fee0cb2c8731465 (diff) | |
| download | go-04450d8a26406f46f2fc6659469b872ce0b85579.tar.gz go-04450d8a26406f46f2fc6659469b872ce0b85579.zip | |
cmd/go: fix -I flag for gc command
R=rsc, remyoudompheng
CC=golang-dev
https://golang.org/cl/5711056
| -rw-r--r-- | src/cmd/go/build.go | 4 |
1 files changed, 3 insertions, 1 deletions
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) |