cmd/go: use -installsuffix to determine the includes directory list

Currently, the directories generaed by includeArgs can have the "_race"
suffix added if invoked with -race flag, but ignores -installsuffix if
set.

R=adg, rsc
CC=golang-dev
https://golang.org/cl/14174043
This commit is contained in:
Dave Day 2013-10-01 20:44:57 -04:00 committed by Russ Cox
parent fcee50c46e
commit 57f69710d5

View file

@ -1052,8 +1052,8 @@ func (b *builder) includeArgs(flag string, all []*action) []string {
dir = filepath.Join(dir, "gccgo_"+goos+"_"+goarch)
} else {
dir = filepath.Join(dir, goos+"_"+goarch)
if buildRace {
dir += "_race"
if buildContext.InstallSuffix != "" {
dir += "_" + buildContext.InstallSuffix
}
}
inc = append(inc, flag, dir)