aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Liam Miller-Cushon <cushon@google.com>2016-04-22 20:02:10 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-04-22 21:20:59 +0000
commit12c5ae69ff8a3ddd1c0ba7b0bcb588b74b1e1ae5 (patch)
tree31bdda44295625f33ecffb88868cea9d2aa3fc2f /scripts
parentb77ab15ab587549baef92903e2d2cca63e665858 (diff)
Wire up --host_java_toolchain
-- MOS_MIGRATED_REVID=120574676
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap/bootstrap.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index d567b0dbc2..d11b6c5086 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -32,11 +32,13 @@ fi
if [ "${JAVA_VERSION}" = "1.7" ]; then
: ${BAZEL_ARGS:=--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \
+ --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \
--define JAVA_VERSION=1.7 \
--genrule_strategy=standalone --spawn_strategy=standalone \
"${EXTRA_BAZEL_ARGS:-}"}
else
: ${BAZEL_ARGS:=--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
+ --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
--strategy=Javac=worker --worker_quit_after_build \
--genrule_strategy=standalone --spawn_strategy=standalone \
"${EXTRA_BAZEL_ARGS:-}"}