aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-07-25 13:00:54 -0700
committerDan Willemsen <dwillemsen@google.com>2017-07-25 13:05:55 -0700
commit91ec9f4b7a067be0cde0300ed8130ec8521d25c0 (patch)
treef954fbf0a46dc1e47f8b6d629f9df84e91e3a888
parentc54c0726672665253a2a0d2118b0c6e4d298758f (diff)
downloadandroid_build_blueprint-91ec9f4b7a067be0cde0300ed8130ec8521d25c0.tar.gz
android_build_blueprint-91ec9f4b7a067be0cde0300ed8130ec8521d25c0.tar.bz2
android_build_blueprint-91ec9f4b7a067be0cde0300ed8130ec8521d25c0.zip
Export GOROOT for minibp / primary builder
Otherwise they'll fall back to the GOROOT embedded in the distribution, which may not be correct. This used to be propagated through build.ninja.in, but exporting it in the environment should catch any other Go users too. Change-Id: I3d6de8494b266e9b127c0a528d31df03ddc5c3a0
-rw-r--r--blueprint_impl.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/blueprint_impl.bash b/blueprint_impl.bash
index 0c5d4b9..0570f94 100644
--- a/blueprint_impl.bash
+++ b/blueprint_impl.bash
@@ -3,6 +3,8 @@ if [ ! "${BLUEPRINT_BOOTSTRAP_VERSION}" -eq "1" ]; then
exit 1
fi
+export GOROOT
+
source "${BLUEPRINTDIR}/microfactory/microfactory.bash"
BUILDDIR="${BUILDDIR}/.minibootstrap" build_go minibp github.com/google/blueprint/bootstrap/minibp