Skip to content

Commit

Permalink
Remove incompatible_use_toolchain_transition = True
Browse files Browse the repository at this point in the history
This has been a no-op since the flag was flipped

#11584

Closes #19254.

PiperOrigin-RevId: 557475784
Change-Id: I61e9067b58b3841eda6cc4250e258bfebbbc5385
  • Loading branch information
keith authored and copybara-github committed Aug 16, 2023
1 parent dfaeab1 commit d83589a
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 18 deletions.
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/cc/cc_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,4 @@ cc_import = rule(
provides = [CcInfo],
toolchains = cc_helper.use_cpp_toolchain(),
fragments = ["cpp"],
incompatible_use_toolchain_transition = True,
)
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/cc/cc_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/cc/cc_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/objc/objc_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,4 @@ objc_import = rule(
),
fragments = ["objc", "apple", "cpp"],
toolchains = cc_helper.use_cpp_toolchain(),
incompatible_use_toolchain_transition = True,
)
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3463,7 +3463,6 @@ public void testExecGroup_duplicateToolchainType() throws Exception {
" exec_compatible_with = ['//something:extra'],",
" ),",
" },",
" incompatible_use_toolchain_transition = True,",
")");
scratch.file(
"something/BUILD",
Expand Down
2 changes: 0 additions & 2 deletions src/test/shell/bazel/cc_api_rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down Expand Up @@ -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"],
)
1 change: 0 additions & 1 deletion src/test/shell/integration/target_compatible_with_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/shell/integration/toolchain_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" <<EOF
Expand Down Expand Up @@ -2499,7 +2498,6 @@ def _impl(ctx):
demo_rule = rule(
implementation = _impl,
toolchains = ["//${pkg}/outer:toolchain_type"],
incompatible_use_toolchain_transition = True,
)
EOF
cat > "${pkg}/rule/BUILD" <<EOF
Expand Down
2 changes: 0 additions & 2 deletions src/test/shell/integration/toolchain_transition_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ sample = rule(
"log": "%{name}.log",
},
toolchains = ["//${pkg}/toolchain:toolchain_type"],
incompatible_use_toolchain_transition = True,
)
def _sample_test_impl(ctx):
Expand Down Expand Up @@ -389,7 +388,6 @@ sample_test = rule(
"log": "%{name}.log",
},
toolchains = ["//${pkg}/toolchain:toolchain_type"],
incompatible_use_toolchain_transition = True,
test = True,
)
EOF
Expand Down
1 change: 0 additions & 1 deletion tools/cpp/cc_flags_supplier.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ cc_flags_supplier = rule(
"_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
},
toolchains = use_cpp_toolchain(),
incompatible_use_toolchain_transition = True,
fragments = ["cpp"],
)
1 change: 0 additions & 1 deletion tools/cpp/compiler_flag.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ compiler_flag = rule(
"_cc_toolchain": attr.label(default = Label("//tools/cpp:current_cc_toolchain")),
},
toolchains = use_cpp_toolchain(),
incompatible_use_toolchain_transition = True,
)

0 comments on commit d83589a

Please sign in to comment.