commit 3984d8de3832bcc05806ac66831236926b997097
author David Crawshaw <crawshaw@google.com> Thu Dec 14 15:08:34 2017 +1100
committer David Crawshaw <crawshaw@golang.org> Fri Dec 15 10:57:08 2017 +1100
tree 9f9d4a06d2e91b6a504cc73aaa24d82bb6074bdb
parent de2d6da936fa0be8bcb0bacd096fe124efff2854

[go] use the given GOROOT for fuchsia builds

GOROOT is set by build.py to point into out/. Use it.

Change-Id: Ie66e0e39cf0f0b9ff6c1919456fc19a018a0d283

go

diff --git a/go b/go
index 239d15e..d5d0469 100755
--- a/go
+++ b/go
@@ -22,9 +22,11 @@
     ;;
 esac
 
-# Setting GOROOT is a workaround for https://golang.org/issue/18678.
-# Remove this (and switch to exec_tool.sh) when Go 1.9 is released.
-export GOROOT="$SCRIPT_ROOT/$HOST_PLATFORM/go"
+if [[ "$GOOS" != "fuchsia" || "$GOROOT" == "" ]]; then
+	# Setting GOROOT is a workaround for https://golang.org/issue/18678.
+	# Remove this (and switch to exec_tool.sh) when Go 1.9 is released.
+	export GOROOT="$SCRIPT_ROOT/$HOST_PLATFORM/go"
+fi
 
 if [[ "$GOOS" == "fuchsia" ]]; then
 	export ZIRCON="$(cd $(dirname ${BASH_SOURCE[0]} )/.. && pwd)/zircon"