Skip to content

Commit a42f009

Browse files
authored
register java toolchain (#1510)
1 parent ae90811 commit a42f009

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

scala/private/rules/scala_binary.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ def make_scala_binary(*extras):
8181
common_outputs,
8282
*[extra["outputs"] for extra in extras if "outputs" in extra]
8383
),
84-
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
84+
toolchains = [
85+
"@io_bazel_rules_scala//scala:toolchain_type",
86+
"@bazel_tools//tools/jdk:toolchain_type",
87+
],
8588
incompatible_use_toolchain_transition = True,
8689
implementation = _scala_binary_impl,
8790
)

scala/private/rules/scala_library.bzl

+12-3
Original file line numberDiff line numberDiff line change
@@ -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
)

scala/private/rules/scala_test.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ def make_scala_test(*extras):
120120
*[extra["outputs"] for extra in extras if "outputs" in extra]
121121
),
122122
test = True,
123-
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
123+
toolchains = [
124+
"@io_bazel_rules_scala//scala:toolchain_type",
125+
"@bazel_tools//tools/jdk:toolchain_type",
126+
],
124127
incompatible_use_toolchain_transition = True,
125128
implementation = _scala_test_impl,
126129
)

0 commit comments

Comments
 (0)