From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 5 Sep 2013 00:02:08 +0000 (-0700)
Subject: cmd/dist: don't print misleading warning when using GOROOT_FINAL
X-Git-Tag: go1.2rc2~346
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f2380a81d707c40e4f8950a2a01bd28a9f004b12;p=gostls13.git

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 0a74ce8bbe..f02bfd8e71 100644
--- 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, " ", "");