diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl index 9b4f7db95e1e1f..6c0a8d0c2d84dc 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl @@ -934,7 +934,6 @@ def make_cc_binary(cc_binary_attrs, **kwargs): }, toolchains = cc_helper.use_cpp_toolchain() + semantics.get_runtimes_toolchain(), - incompatible_use_toolchain_transition = True, executable = True, **kwargs ) diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl index ee290ff3d7cbb3..03663805bdcb17 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl @@ -212,5 +212,4 @@ cc_import = rule( provides = [CcInfo], toolchains = cc_helper.use_cpp_toolchain(), fragments = ["cpp"], - incompatible_use_toolchain_transition = True, ) diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl index 5e1e2e185cb49c..f36de71a639c59 100755 --- a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl @@ -619,7 +619,6 @@ cc_library = rule( toolchains = cc_helper.use_cpp_toolchain() + semantics.get_runtimes_toolchain(), fragments = ["cpp"] + semantics.additional_fragments(), - incompatible_use_toolchain_transition = True, provides = [CcInfo], exec_groups = { "cpp_link": exec_group(toolchains = cc_helper.use_cpp_toolchain()), diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl index 1f863ca81203d8..820f4da05db27c 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl @@ -842,7 +842,6 @@ cc_shared_library = rule( }, toolchains = cc_helper.use_cpp_toolchain(), fragments = ["cpp"] + semantics.additional_fragments(), - incompatible_use_toolchain_transition = True, ) for_testing_dont_use_check_if_target_under_path = _check_if_target_under_path diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl index 6130fdddf40603..7befd1853f8640 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_test.bzl @@ -140,6 +140,5 @@ def make_cc_test(with_linkstatic = False, with_aspects = False): toolchains = [] + cc_helper.use_cpp_toolchain() + semantics.get_runtimes_toolchain(), - incompatible_use_toolchain_transition = True, test = True, ) diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl index 7103a694cd6547..ede447ec9b2e1a 100644 --- a/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl @@ -91,5 +91,4 @@ objc_import = rule( ), fragments = ["objc", "apple", "cpp"], toolchains = cc_helper.use_cpp_toolchain(), - incompatible_use_toolchain_transition = True, ) diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl index 038e7f84229c00..9721fdca358735 100644 --- a/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl @@ -135,5 +135,4 @@ objc_library = rule( fragments = ["objc", "apple", "cpp"], cfg = apple_crosstool_transition, toolchains = cc_helper.use_cpp_toolchain(), - incompatible_use_toolchain_transition = True, ) diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PythonToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PythonToolchainTest.java index acfa66641ee35e..bb8b00acd94de6 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/python/PythonToolchainTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/python/PythonToolchainTest.java @@ -72,7 +72,6 @@ public void userDefinedConsumerUsingToolchainResolution() throws Exception { "myrule = rule(", " implementation = _myrule_impl,", " toolchains = ['" + TOOLCHAIN_TYPE + "'],", - " incompatible_use_toolchain_transition = True,", ")"); // A toolchain implementation and an instance of the rule that will use it. scratch.file( diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java index d2ebcf89ddd648..afa497dc112376 100644 --- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java @@ -3463,7 +3463,6 @@ public void testExecGroup_duplicateToolchainType() throws Exception { " exec_compatible_with = ['//something:extra'],", " ),", " },", - " incompatible_use_toolchain_transition = True,", ")"); scratch.file( "something/BUILD", diff --git a/src/test/shell/bazel/cc_api_rules.bzl b/src/test/shell/bazel/cc_api_rules.bzl index f3608f8e746eff..553f6615e41821 100644 --- a/src/test/shell/bazel/cc_api_rules.bzl +++ b/src/test/shell/bazel/cc_api_rules.bzl @@ -101,7 +101,6 @@ cc_lib = rule( "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), }, fragments = ["cpp"], - incompatible_use_toolchain_transition = True, toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], ) @@ -200,6 +199,5 @@ cc_bin = rule( "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), }, fragments = ["cpp"], - incompatible_use_toolchain_transition = True, toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], ) diff --git a/src/test/shell/integration/target_compatible_with_test.sh b/src/test/shell/integration/target_compatible_with_test.sh index b99686c940d3f3..aaba612646a223 100755 --- a/src/test/shell/integration/target_compatible_with_test.sh +++ b/src/test/shell/integration/target_compatible_with_test.sh @@ -268,7 +268,6 @@ def _compiler_flag_impl(ctx): compiler_flag = rule( implementation = _compiler_flag_impl, toolchains = ["//target_skipping/custom_tools:toolchain_type"], - incompatible_use_toolchain_transition = True, ) EOF } diff --git a/src/test/shell/integration/toolchain_test.sh b/src/test/shell/integration/toolchain_test.sh index 1c6ac406ddef72..894d9504d78ceb 100755 --- a/src/test/shell/integration/toolchain_test.sh +++ b/src/test/shell/integration/toolchain_test.sh @@ -2464,7 +2464,6 @@ def _impl(ctx): outer_toolchain = rule( implementation = _impl, toolchains = ["//${pkg}/inner:toolchain_type"], - incompatible_use_toolchain_transition = True, ) EOF cat > "${pkg}/outer/BUILD" < "${pkg}/rule/BUILD" <