cmd/dist: use correct package target when cross-compiling

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5672050

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index e115e3c322f1152485d89ea7881654c6760e7c0c..67860cdf33572f278e60984f45449ae03f95f87a 100644 (file)
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -605,10 +605,10 @@ install(char *dir)
                // Go library (package).
                vadd(&link, bpathf(&b, "%s/pack", tooldir));
                vadd(&link, "grc");
-               p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, gohostos, gohostarch, dir+4);
+               p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, goos, goarch, dir+4);
                *xstrrchr(p, '/') = '\0';
                xmkdirall(p);
-               vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, gohostos, gohostarch, dir+4));
+               vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir+4));
        } else if(streq(dir, "cmd/go") || streq(dir, "cmd/cgo")) {
                // Go command.
                vadd(&link, bpathf(&b, "%s/%sl", tooldir, gochar));