commit 2a99526f5f94bc0d23ea5cc86fec028393c64a0f
author jcater <jcater@google.com> Wed Apr 22 05:45:26 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 22 05:46:40 2020 -0700
tree 76fbaccf9d73c6b6b364900d2529b72b893019b7
parent 69bb39300a267dad019562592be33b90abe99583

Temporary fix for gen_command-line_reference until https://github.com/bazelbuild/bazel/issues/11179 is fixed and released.

PiperOrigin-RevId: 307798565

src/main/java/com/google/devtools/build/lib/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index ed729d4..fef9303 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -787,6 +787,8 @@
     cmd = (
         "cat $(location //site:command-line-reference-prefix.html) > $@ && " +
         "TMP=`mktemp -d /tmp/tmp.XXXXXXXXXX` && " +
+        # TODO(#11179): Remove when the stub template fix is released.
+        "export JARBIN=$(JAVABASE)/bin/jar && " +
         "$(location //src/main/java/com/google/devtools/build/lib/bazel:BazelServer) " +
         "--jvm_flag=-Dio.bazel.EnableJni=0 --batch " +
         "--install_base=$${TMP} --output_base=$${TMP}/output/ --output_user_root=$${TMP} " +
@@ -794,6 +796,7 @@
         "help everything-as-html >> $@ 2>/dev/null && " +
         "cat $(location //site:command-line-reference-suffix.html) >> $@"
     ),
+    toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
     tools = [
         "//src/main/java/com/google/devtools/build/lib/bazel:BazelServer",
     ],