@@ -97,7 +97,10 @@ def make_scala_library(*extras):
97
97
common_outputs ,
98
98
* [extra ["outputs" ] for extra in extras if "outputs" in extra ]
99
99
),
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
+ ],
101
104
incompatible_use_toolchain_transition = True ,
102
105
implementation = _scala_library_impl ,
103
106
)
@@ -191,7 +194,10 @@ def make_scala_library_for_plugin_bootstrapping(*extras):
191
194
common_outputs ,
192
195
* [extra ["outputs" ] for extra in extras if "outputs" in extra ]
193
196
),
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
+ ],
195
201
incompatible_use_toolchain_transition = True ,
196
202
implementation = _scala_library_for_plugin_bootstrapping_impl ,
197
203
)
@@ -259,7 +265,10 @@ def make_scala_macro_library(*extras):
259
265
common_outputs ,
260
266
* [extra ["outputs" ] for extra in extras if "outputs" in extra ]
261
267
),
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
+ ],
263
272
incompatible_use_toolchain_transition = True ,
264
273
implementation = _scala_macro_library_impl ,
265
274
)
0 commit comments