]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.3] nacltest.bash: unset GOROOT
authorRuss Cox <rsc@golang.org>
Tue, 30 Sep 2014 16:34:36 +0000 (12:34 -0400)
committerRuss Cox <rsc@golang.org>
Tue, 30 Sep 2014 16:34:36 +0000 (12:34 -0400)
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

src/nacltest.bash

index 33fc8c1c4eddaa44e8cfe35484e07bdc6886a4b1..e5bbb4b683fb1e0b9f4693f76fac60e571f25724 100755 (executable)
@@ -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}