@@ -97,7 +97,10 @@ def make_scala_library(*extras):
9797 common_outputs ,
9898 * [extra ["outputs" ] for extra in extras if "outputs" in extra ]
9999 ),
100- toolchains = ["@io_bazel_rules_scala//scala:toolchain_type" ],
100+ toolchains = [
101+ "@io_bazel_rules_scala//scala:toolchain_type" ,
102+ "@bazel_tools//tools/jdk:toolchain_type" ,
103+ ],
101104 incompatible_use_toolchain_transition = True ,
102105 implementation = _scala_library_impl ,
103106 )
@@ -191,7 +194,10 @@ def make_scala_library_for_plugin_bootstrapping(*extras):
191194 common_outputs ,
192195 * [extra ["outputs" ] for extra in extras if "outputs" in extra ]
193196 ),
194- toolchains = ["@io_bazel_rules_scala//scala:toolchain_type" ],
197+ toolchains = [
198+ "@io_bazel_rules_scala//scala:toolchain_type" ,
199+ "@bazel_tools//tools/jdk:toolchain_type" ,
200+ ],
195201 incompatible_use_toolchain_transition = True ,
196202 implementation = _scala_library_for_plugin_bootstrapping_impl ,
197203 )
@@ -259,7 +265,10 @@ def make_scala_macro_library(*extras):
259265 common_outputs ,
260266 * [extra ["outputs" ] for extra in extras if "outputs" in extra ]
261267 ),
262- toolchains = ["@io_bazel_rules_scala//scala:toolchain_type" ],
268+ toolchains = [
269+ "@io_bazel_rules_scala//scala:toolchain_type" ,
270+ "@bazel_tools//tools/jdk:toolchain_type" ,
271+ ],
263272 incompatible_use_toolchain_transition = True ,
264273 implementation = _scala_macro_library_impl ,
265274 )
0 commit comments