summaryrefslogtreecommitdiff
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
commit1fb3d5245073190c7ed0049efe6c511b5e017ed8 (patch)
tree58d88a9a950c388937abd4bd1247c17263a3308b
parentc40928fa96aac2a762cf9ee08ab453f13d30a5a1 (diff)
downloadgo-1fb3d5245073190c7ed0049efe6c511b5e017ed8.tar.gz
[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://codereview.appspot.com/147380044
-rwxr-xr-xsrc/nacltest.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nacltest.bash b/src/nacltest.bash
index 33fc8c1c4..e5bbb4b68 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}