From: Dave Day <djd@golang.org>
Date: Wed, 2 Oct 2013 00:44:57 +0000 (-0400)
Subject: cmd/go: use -installsuffix to determine the includes directory list
X-Git-Tag: go1.2rc2~97
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=57f69710d5d0f8fb24bb07aa3ce83f98077d9112;p=gostls13.git

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
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index e614f2f538..b7edd49ce0 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -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)