aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2013-10-11 16:17:45 -0700
committerIan Lance Taylor <iant@golang.org>2013-10-11 16:17:45 -0700
commit5b2f62615970532374c9bd1b48dfe7f7ffef217a (patch)
tree6e41d0dc3621eb339260826d41b437449fa4935a
parent96648e019567d9e50c147638f104f0bf4a381350 (diff)
downloadgo-5b2f62615970532374c9bd1b48dfe7f7ffef217a.tar.gz
go-5b2f62615970532374c9bd1b48dfe7f7ffef217a.zip
go/build: add GOOS and GOARCH to name of gccgo pkg directory
This matches the behaviour of builder.includeArgs in cmd/go/build.go. R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/14535048
-rw-r--r--src/pkg/go/build/build.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pkg/go/build/build.go b/src/pkg/go/build/build.go
index 8b6b2636ae..50d2fb4aeb 100644
--- a/src/pkg/go/build/build.go
+++ b/src/pkg/go/build/build.go
@@ -445,7 +445,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
switch ctxt.Compiler {
case "gccgo":
dir, elem := pathpkg.Split(p.ImportPath)
- pkga = "pkg/gccgo/" + dir + "lib" + elem + ".a"
+ pkga = "pkg/gccgo_" + ctxt.GOOS + "_" + ctxt.GOARCH + "/" + dir + "lib" + elem + ".a"
case "gc":
suffix := ""
if ctxt.InstallSuffix != "" {