Fix build, attempt #4

bazelbuild · Nov 6, 2023 · 9ffb676 · 9ffb676
1 parent aa6b7a6
commit 9ffb676
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.bazelrc b/.bazelrc
@@ -17,6 +17,7 @@ build:remote_shared --noexperimental_check_desugar_deps
 # Workaround for https://github.com/bazelbuild/bazel/issues/19837.
 # TODO(bazel-team): Remove this toolchain when .bazelversion is 7.0.0rc2 or later.
 build:ubuntu2004_java11 --extra_toolchains=//:bazel_rbe_java_toolchain_definition
+build:ubuntu2004_java11 --extra_toolchains=//:bazel_rbe_bootstrap_runtime_toolchain
 build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//java:all
 build:ubuntu2004_java11 --crosstool_top=@rbe_ubuntu2004_java11//cc:toolchain
 build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//config:cc-toolchain

diff --git a/BUILD b/BUILD
@@ -296,7 +296,7 @@ REMOTE_PLATFORMS = ("rbe_ubuntu2004_java11",)
 ]
 
 # Workaround for https://github.com/bazelbuild/bazel/issues/19837.
-# TODO(bazel-team): Remove these two targets when .bazelversion is 7.0.0rc2 or later.
+# TODO(bazel-team): Remove these three targets when .bazelversion is 7.0.0rc2 or later.
 default_java_toolchain(
     name = "bazel_java_toolchain",
     bootclasspath = ["@rules_java//toolchains:platformclasspath"],
@@ -307,6 +307,13 @@ default_java_toolchain(
 
 default_java_toolchain(
     name = "bazel_rbe_java_toolchain",
+    bootclasspath = [],
     source_version = "11",
     target_version = "11",
 )
+
+toolchain(
+    name = "bazel_rbe_bootstrap_runtime_toolchain",
+    toolchain = ":bazel_rbe_java_toolchain",
+    toolchain_type = "@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type",
+)