diff --git a/foreign_cc/boost_build.bzl b/foreign_cc/boost_build.bzl index 246211764..64bfee3e9 100644 --- a/foreign_cc/boost_build.bzl +++ b/foreign_cc/boost_build.bzl @@ -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, ) diff --git a/foreign_cc/cmake.bzl b/foreign_cc/cmake.bzl index 8c958c0d7..781b14ef0 100644 --- a/foreign_cc/cmake.bzl +++ b/foreign_cc/cmake.bzl @@ -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): diff --git a/foreign_cc/configure.bzl b/foreign_cc/configure.bzl index d0f50d156..64551f341 100644 --- a/foreign_cc/configure.bzl +++ b/foreign_cc/configure.bzl @@ -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): diff --git a/foreign_cc/make.bzl b/foreign_cc/make.bzl index fcdd8a5cf..79e76a26b 100644 --- a/foreign_cc/make.bzl +++ b/foreign_cc/make.bzl @@ -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): diff --git a/foreign_cc/meson.bzl b/foreign_cc/meson.bzl index 9d4179ab2..dcce35d8f 100644 --- a/foreign_cc/meson.bzl +++ b/foreign_cc/meson.bzl @@ -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): diff --git a/foreign_cc/ninja.bzl b/foreign_cc/ninja.bzl index 9b872e622..abfe2d04c 100644 --- a/foreign_cc/ninja.bzl +++ b/foreign_cc/ninja.bzl @@ -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, ) diff --git a/foreign_cc/private/transitions.bzl b/foreign_cc/private/transitions.bzl index 7a47b0da5..0a89efade 100644 --- a/foreign_cc/private/transitions.bzl +++ b/foreign_cc/private/transitions.bzl @@ -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): diff --git a/toolchains/native_tools/native_tools_toolchain.bzl b/toolchains/native_tools/native_tools_toolchain.bzl index 7d382d679..8fe6fc7d6 100644 --- a/toolchains/native_tools/native_tools_toolchain.bzl +++ b/toolchains/native_tools/native_tools_toolchain.bzl @@ -99,5 +99,4 @@ native_tool_toolchain = rule( allow_files = True, ), }, - incompatible_use_toolchain_transition = True, ) diff --git a/toolchains/toolchains.bzl b/toolchains/toolchains.bzl index 87178e788..a4491b682 100644 --- a/toolchains/toolchains.bzl +++ b/toolchains/toolchains.bzl @@ -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")), ], @@ -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")), ], @@ -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")), ], @@ -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")), ], @@ -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")), ], @@ -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")), ], @@ -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")), ], @@ -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")), ],