cmd/dist: don't print misleading warning when using GOROOT_FINAL

Fixes #5240.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/13546044

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 0a74ce8bbed6bc62f30b0f54911123525db0379e..f02bfd8e71109a6df7d412e9e7afcf5410247ad3 100644 (file)
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1660,7 +1660,10 @@ cmdbanner(int argc, char **argv)
        xprintf("Installed Go for %s/%s in %s\n", goos, goarch, goroot);
        xprintf("Installed commands in %s\n", gobin);
 
-       if(streq(gohostos, "plan9")) {
+       if(!xsamefile(goroot_final, goroot)) {
+               // If the files are to be moved, don't check that gobin
+               // is on PATH; assume they know what they are doing.
+       } else if(streq(gohostos, "plan9")) {
                // Check that gobin is bound before /bin.
                readfile(&b, "#c/pid");
                bsubst(&b, " ", "");