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

diff --git a/src/pkg/go/build/build.go b/src/pkg/go/build/build.go
index 8b6b2636ae781b006f6ee6f56d7c30ada1953309..50d2fb4aeba4bc6536ab7004d5a1f6a36df75e88 100644 (file)
--- 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 != "" {