Skip to content

Commit 3b0ebe8

Browse files
authored
Remove deprecated use of incompatible_use_toolchain_transition (#1314)
1 parent 0262b1b commit 3b0ebe8

File tree

9 files changed

+0
-28
lines changed

9 files changed

+0
-28
lines changed

foreign_cc/boost_build.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,4 @@ boost_build = rule(
6161
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
6262
"@bazel_tools//tools/cpp:toolchain_type",
6363
],
64-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
65-
# version is updated to a release of Bazel containing the new default for this setting.
66-
incompatible_use_toolchain_transition = True,
6764
)

foreign_cc/cmake.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,6 @@ cmake = rule(
421421
"@bazel_tools//tools/cpp:toolchain_type",
422422
],
423423
provides = [CcInfo],
424-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
425-
# version is updated to a release of Bazel containing the new default for this setting.
426-
incompatible_use_toolchain_transition = True,
427424
)
428425

429426
def cmake_variant(name, toolchain, **kwargs):

foreign_cc/configure.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@ configure_make = rule(
246246
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
247247
"@bazel_tools//tools/cpp:toolchain_type",
248248
],
249-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
250-
# version is updated to a release of Bazel containing the new default for this setting.
251-
incompatible_use_toolchain_transition = True,
252249
)
253250

254251
def configure_make_variant(name, toolchain, **kwargs):

foreign_cc/make.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ make = rule(
132132
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
133133
"@bazel_tools//tools/cpp:toolchain_type",
134134
],
135-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
136-
# version is updated to a release of Bazel containing the new default for this setting.
137-
incompatible_use_toolchain_transition = True,
138135
)
139136

140137
def make_variant(name, toolchain, **kwargs):

foreign_cc/meson.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ meson = rule(
198198
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
199199
"@bazel_tools//tools/cpp:toolchain_type",
200200
],
201-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
202-
# version is updated to a release of Bazel containing the new default for this setting.
203-
incompatible_use_toolchain_transition = True,
204201
)
205202

206203
def meson_with_requirements(name, requirements, **kwargs):

foreign_cc/ninja.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,4 @@ ninja = rule(
118118
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
119119
"@bazel_tools//tools/cpp:toolchain_type",
120120
],
121-
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
122-
# version is updated to a release of Bazel containing the new default for this setting.
123-
incompatible_use_toolchain_transition = True,
124121
)

foreign_cc/private/transitions.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ extra_toolchains_transitioned_foreign_cc_target = rule(
3838
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
3939
),
4040
},
41-
incompatible_use_toolchain_transition = True,
4241
)
4342

4443
def foreign_cc_rule_variant(name, rule, toolchain, **kwargs):

toolchains/native_tools/native_tools_toolchain.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,4 @@ native_tool_toolchain = rule(
9999
allow_files = True,
100100
),
101101
},
102-
incompatible_use_toolchain_transition = True,
103102
)

toolchains/toolchains.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ current_cmake_toolchain = rule(
5252
attrs = {
5353
"_toolchain": attr.string(default = str(Label("//toolchains:cmake_toolchain"))),
5454
},
55-
incompatible_use_toolchain_transition = True,
5655
toolchains = [
5756
str(Label("//toolchains:cmake_toolchain")),
5857
],
@@ -63,7 +62,6 @@ current_make_toolchain = rule(
6362
attrs = {
6463
"_toolchain": attr.string(default = str(Label("//toolchains:make_toolchain"))),
6564
},
66-
incompatible_use_toolchain_transition = True,
6765
toolchains = [
6866
str(Label("//toolchains:make_toolchain")),
6967
],
@@ -74,7 +72,6 @@ current_ninja_toolchain = rule(
7472
attrs = {
7573
"_toolchain": attr.string(default = str(Label("//toolchains:ninja_toolchain"))),
7674
},
77-
incompatible_use_toolchain_transition = True,
7875
toolchains = [
7976
str(Label("//toolchains:ninja_toolchain")),
8077
],
@@ -85,7 +82,6 @@ current_meson_toolchain = rule(
8582
attrs = {
8683
"_toolchain": attr.string(default = str(Label("//toolchains:meson_toolchain"))),
8784
},
88-
incompatible_use_toolchain_transition = True,
8985
toolchains = [
9086
str(Label("//toolchains:meson_toolchain")),
9187
],
@@ -96,7 +92,6 @@ current_autoconf_toolchain = rule(
9692
attrs = {
9793
"_toolchain": attr.string(default = str(Label("//toolchains:autoconf_toolchain"))),
9894
},
99-
incompatible_use_toolchain_transition = True,
10095
toolchains = [
10196
str(Label("//toolchains:autoconf_toolchain")),
10297
],
@@ -107,7 +102,6 @@ current_automake_toolchain = rule(
107102
attrs = {
108103
"_toolchain": attr.string(default = str(Label("//toolchains:automake_toolchain"))),
109104
},
110-
incompatible_use_toolchain_transition = True,
111105
toolchains = [
112106
str(Label("//toolchains:automake_toolchain")),
113107
],
@@ -118,7 +112,6 @@ current_m4_toolchain = rule(
118112
attrs = {
119113
"_toolchain": attr.string(default = str(Label("//toolchains:m4_toolchain"))),
120114
},
121-
incompatible_use_toolchain_transition = True,
122115
toolchains = [
123116
str(Label("//toolchains:m4_toolchain")),
124117
],
@@ -129,7 +122,6 @@ current_pkgconfig_toolchain = rule(
129122
attrs = {
130123
"_toolchain": attr.string(default = str(Label("//toolchains:pkgconfig_toolchain"))),
131124
},
132-
incompatible_use_toolchain_transition = True,
133125
toolchains = [
134126
str(Label("//toolchains:pkgconfig_toolchain")),
135127
],

0 commit comments

Comments
 (0)