commit 8e0f66aa4ab90b509b2af543347f8f57e4ec2a99
author Yun Peng <pcloudy@google.com> Mon May 25 06:52:14 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 25 06:53:27 2020 -0700
tree 111148d2af124e5b6348e38614b9f4bffa89a67f
parent 4f2d50cefd1db2b099a6ef2296a6d14e6a7abd3a

Always use //src/java_tools/buildjar:bootstrap_toolchain

To build Bazel without downloading remote java tools, we'll have to use the bootstrap toolchain.

This is basically a part of rollback of https://github.com/bazelbuild/bazel/pull/11192

Working towards: #9408

Closes #11478.

PiperOrigin-RevId: 313069864

scripts/bootstrap/bootstrap.sh

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index f5cf4d3..64a9406 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -31,17 +31,13 @@
 
 : ${JAVA_VERSION:="1.8"}
 
-if [ -d derived ]; then
-  # Flags we need to bootstrap from the dist archive.
-  DIST_BOOTSTRAP_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
-      --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
-      --distdir=derived/distdir"
-fi
-
 _BAZEL_ARGS="--spawn_strategy=standalone \
       --nojava_header_compilation \
       --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
       --compilation_mode=opt \
+      --distdir=derived/distdir \
+      --java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
+      --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
       ${DIST_BOOTSTRAP_ARGS:-} \
       ${EXTRA_BAZEL_ARGS:-}"