Skip to content

Commit

Permalink
Remove deprecated use of incompatible_use_toolchain_transition (bazel…
Browse files Browse the repository at this point in the history
  • Loading branch information
EdSchouten authored Nov 5, 2024
1 parent 0262b1b commit 3b0ebe8
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 28 deletions.
3 changes: 0 additions & 3 deletions foreign_cc/boost_build.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,4 @@ boost_build = rule(
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
"@bazel_tools//tools/cpp:toolchain_type",
],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)
3 changes: 0 additions & 3 deletions foreign_cc/cmake.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,6 @@ cmake = rule(
"@bazel_tools//tools/cpp:toolchain_type",
],
provides = [CcInfo],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)

def cmake_variant(name, toolchain, **kwargs):
Expand Down
3 changes: 0 additions & 3 deletions foreign_cc/configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,6 @@ configure_make = rule(
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
"@bazel_tools//tools/cpp:toolchain_type",
],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)

def configure_make_variant(name, toolchain, **kwargs):
Expand Down
3 changes: 0 additions & 3 deletions foreign_cc/make.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,6 @@ make = rule(
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
"@bazel_tools//tools/cpp:toolchain_type",
],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)

def make_variant(name, toolchain, **kwargs):
Expand Down
3 changes: 0 additions & 3 deletions foreign_cc/meson.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@ meson = rule(
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
"@bazel_tools//tools/cpp:toolchain_type",
],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)

def meson_with_requirements(name, requirements, **kwargs):
Expand Down
3 changes: 0 additions & 3 deletions foreign_cc/ninja.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,4 @@ ninja = rule(
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
"@bazel_tools//tools/cpp:toolchain_type",
],
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
# version is updated to a release of Bazel containing the new default for this setting.
incompatible_use_toolchain_transition = True,
)
1 change: 0 additions & 1 deletion foreign_cc/private/transitions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ extra_toolchains_transitioned_foreign_cc_target = rule(
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
),
},
incompatible_use_toolchain_transition = True,
)

def foreign_cc_rule_variant(name, rule, toolchain, **kwargs):
Expand Down
1 change: 0 additions & 1 deletion toolchains/native_tools/native_tools_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,4 @@ native_tool_toolchain = rule(
allow_files = True,
),
},
incompatible_use_toolchain_transition = True,
)
8 changes: 0 additions & 8 deletions toolchains/toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ current_cmake_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:cmake_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:cmake_toolchain")),
],
Expand All @@ -63,7 +62,6 @@ current_make_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:make_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:make_toolchain")),
],
Expand All @@ -74,7 +72,6 @@ current_ninja_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:ninja_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:ninja_toolchain")),
],
Expand All @@ -85,7 +82,6 @@ current_meson_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:meson_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:meson_toolchain")),
],
Expand All @@ -96,7 +92,6 @@ current_autoconf_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:autoconf_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:autoconf_toolchain")),
],
Expand All @@ -107,7 +102,6 @@ current_automake_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:automake_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:automake_toolchain")),
],
Expand All @@ -118,7 +112,6 @@ current_m4_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:m4_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:m4_toolchain")),
],
Expand All @@ -129,7 +122,6 @@ current_pkgconfig_toolchain = rule(
attrs = {
"_toolchain": attr.string(default = str(Label("//toolchains:pkgconfig_toolchain"))),
},
incompatible_use_toolchain_transition = True,
toolchains = [
str(Label("//toolchains:pkgconfig_toolchain")),
],
Expand Down

0 comments on commit 3b0ebe8

Please sign in to comment.