Commit 57f69710 authored by Dave Day's avatar Dave Day Committed by Russ Cox

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
parent fcee50c4
...@@ -1052,8 +1052,8 @@ func (b *builder) includeArgs(flag string, all []*action) []string { ...@@ -1052,8 +1052,8 @@ func (b *builder) includeArgs(flag string, all []*action) []string {
dir = filepath.Join(dir, "gccgo_"+goos+"_"+goarch) dir = filepath.Join(dir, "gccgo_"+goos+"_"+goarch)
} else { } else {
dir = filepath.Join(dir, goos+"_"+goarch) dir = filepath.Join(dir, goos+"_"+goarch)
if buildRace { if buildContext.InstallSuffix != "" {
dir += "_race" dir += "_" + buildContext.InstallSuffix
} }
} }
inc = append(inc, flag, dir) inc = append(inc, flag, dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment