From: Dave Cheney <dave@cheney.net>
Date: Thu, 20 Aug 2015 02:28:51 +0000 (+1000)
Subject: make.bash: abort if $GOROOT_BOOTSTRAP == $GOROOT
X-Git-Tag: go1.6beta1~1294
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f9379eb3467d2b6feb8fb0c7c2c366b81408305d;p=gostls13.git

make.bash: abort if $GOROOT_BOOTSTRAP == $GOROOT

Fixes #12214

Change-Id: I82586b54ac7b9c0c71055bb66b921e3efbf4977c
Reviewed-on: https://go-review.googlesource.com/13719
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
---

diff --git a/src/make.bash b/src/make.bash
index f17648aff5..b4780c7e9a 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -116,6 +116,12 @@ GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
 if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
 	echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2
 	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2
+	exit 1
+fi
+if [ "$GOROOT_BOOTSTRAP" == "$GOROOT" ]; then
+	echo "ERROR: \$GOROOT_BOOTSTRAP must not be set to \$GOROOT" >&2
+	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2
+	exit 1
 fi
 rm -f cmd/dist/dist
 GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist