]> Cypherpunks repositories - gostls13.git/commitdiff
nacltest.bash: set GOROOT before invoking cmd/go
authorShenghou Ma <minux@golang.org>
Thu, 10 Jul 2014 19:36:48 +0000 (15:36 -0400)
committerShenghou Ma <minux@golang.org>
Thu, 10 Jul 2014 19:36:48 +0000 (15:36 -0400)
The builder builds with GOROOT_FINAL=/usr/local/go set.

TBR=rsc
R=golang-codereviews
CC=golang-codereviews
https://golang.org/cl/112100043

src/nacltest.bash

index 2b62830a8807ae97eb84406058535c37a702a61f..154d99ae9827645f300a131ac1d3f15b10a15c6b 100755 (executable)
@@ -67,6 +67,9 @@ if [ ! -f make.bash ]; then
 fi
 GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH ./make.bash
 
+# the builder might have set GOROOT_FINAL.
+export GOROOT=$(pwd)/..
+
 # Build zip file embedded in package syscall.
 gobin=${GOBIN:-$(pwd)/../bin}
 rm -f pkg/syscall/fstest_nacl.go