aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-09-30 12:34:36 -0400
committerRuss Cox <rsc@golang.org>2014-09-30 12:34:36 -0400
commitc09c8bb32595fc4b0bfcb1f6cedaf01040b05e1a (patch)
tree4d59c2b0704c7e0a42bf763801e5848c5e62cf6d
parentfcfb7aaf2ed8ffbe22c7c40e8536523c4ae599cb (diff)
downloadgo-c09c8bb32595fc4b0bfcb1f6cedaf01040b05e1a.tar.gz
go-c09c8bb32595fc4b0bfcb1f6cedaf01040b05e1a.zip
[release-branch.go1.3] nacltest.bash: unset GOROOT
The GOROOT baked into the go command being run is correct. The GOROOT in the environment may not be. Remove it. Fixes nacltest.bash if you have GOROOT set elsewhere. This is already fixed in the default branch. LGTM=r R=golang-codereviews, r CC=bradfitz, golang-codereviews, iant https://golang.org/cl/147380044
-rwxr-xr-xsrc/nacltest.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nacltest.bash b/src/nacltest.bash
index 33fc8c1c4e..e5bbb4b683 100755
--- a/src/nacltest.bash
+++ b/src/nacltest.bash
@@ -45,6 +45,7 @@ if [ ! -f make.bash ]; then
exit 1
fi
GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH ./make.bash
+unset GOROOT
# Build zip file embedded in package syscall.
gobin=${GOBIN:-$(pwd)/../bin}