From f9379eb3467d2b6feb8fb0c7c2c366b81408305d Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Thu, 20 Aug 2015 12:28:51 +1000 Subject: [PATCH] make.bash: abort if $GOROOT_BOOTSTRAP == $GOROOT Fixes #12214 Change-Id: I82586b54ac7b9c0c71055bb66b921e3efbf4977c Reviewed-on: https://go-review.googlesource.com/13719 Reviewed-by: Brad Fitzpatrick Reviewed-by: Andrew Gerrand --- src/make.bash | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- 2.48.1