From 54d0b5ab6a45dd9c0d8cf27ada3200c2f5ec6b28 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Thu, 10 Jul 2014 15:36:48 -0400 Subject: [PATCH] nacltest.bash: set GOROOT before invoking cmd/go 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/nacltest.bash b/src/nacltest.bash index 2b62830a88..154d99ae98 100755 --- a/src/nacltest.bash +++ b/src/nacltest.bash @@ -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 -- 2.48.1