bazel
/
rules_cc
mirror of https://github.com/bazelbuild/rules_cc
2
0
Fork 0
Code Issues Releases Activity

Automated rollback of commit 0640261093. 

*** Reason for rollback ***

Breaks cc_builtin_tests

*** Original change description ***

Copybara Merge: https://github.com/bazelbuild/rules_cc/pull/257

BEGIN_PUBLIC
Copybara import of the project:

--
12a8bd59af by Fabian Meumertzheim <fabian@meumertzhe.im>:

Move static library validation helper to `ar_files`

It doesn't need to be staged for every compile or link action. The action that uses it stages `all_files`.

END_PUBLIC

***

PiperOrigin-RevId: 695300596
Change-Id: If10c95c1867716c82a09ad3acdfd479beedcc6c5
This commit is contained in:
Googler 2024-11-11 05:49:23 -08:00 committed by Copybara-Service
parent 1698d2bf3a
commit fe7ca631ab
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bazelci/presubmit.yml
View File

@ -5,12 +5,14 @@ build_targets: &build_targets
- "//examples/..." - "//examples/..."
- "//tests/..." - "//tests/..."
- "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux
- "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
test_targets: &test_targets test_targets: &test_targets
- "//:all" - "//:all"
- "//cc/..." - "//cc/..."
- "//examples/..." - "//examples/..."
- "//tests/..." - "//tests/..."
- "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux
- "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
build_targets_bazel_6: &build_targets_bazel_6 build_targets_bazel_6: &build_targets_bazel_6
- "//:all" - "//:all"
@ -20,6 +22,7 @@ build_targets_bazel_6: &build_targets_bazel_6
- "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux
- "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None - "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None
- "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6 - "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6
- "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
test_targets_bazel_6: &test_targets_bazel_6 test_targets_bazel_6: &test_targets_bazel_6
- "//:all" - "//:all"
- "//cc:all" - "//cc:all"
@ -28,6 +31,7 @@ test_targets_bazel_6: &test_targets_bazel_6
- "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux
- "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None - "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None
- "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6 - "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6
- "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
buildifier: buildifier:
version: latest version: latest
@ -75,6 +79,7 @@ tasks:
- "//tests/..." - "//tests/..."
- "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux
- "-//tests/system_library:system_library_test" # Fails because of repo setup - "-//tests/system_library:system_library_test" # Fails because of repo setup
- "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
macos_head: macos_head:
name: MacOS (Bazel HEAD) name: MacOS (Bazel HEAD)
bazel: last_green bazel: last_green

5
cc/private/toolchain/BUILD.tpl
View File

@ -69,11 +69,6 @@ filegroup(
srcs = glob(["extra_tools/**"], allow_empty = True) + [%{cc_compiler_deps}], srcs = glob(["extra_tools/**"], allow_empty = True) + [%{cc_compiler_deps}],
) )
filegroup(
name = "ar_files",
srcs = [":compiler_deps"] + [%{ar_deps}],
)
# This is the entry point for --crosstool_top. Toolchains are found # This is the entry point for --crosstool_top. Toolchains are found
# by lopping off the name of --crosstool_top and searching for # by lopping off the name of --crosstool_top and searching for
# the "${CPU}" entry in the toolchains attribute. # the "${CPU}" entry in the toolchains attribute.

5
cc/private/toolchain/unix_cc_configure.bzl
View File

@ -629,8 +629,9 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overridden_tools):
":builtin_include_directory_paths", ":builtin_include_directory_paths",
":cc_wrapper", ":cc_wrapper",
":deps_scanner_wrapper", ":deps_scanner_wrapper",
]), ] + (
"%{ar_deps}": get_starlark_list([":validate_static_library"] if "validate_static_library" in tool_paths else []), [":validate_static_library"] if "validate_static_library" in tool_paths else []
)),
"%{cc_toolchain_identifier}": cc_toolchain_identifier, "%{cc_toolchain_identifier}": cc_toolchain_identifier,
"%{compile_flags}": get_starlark_list( "%{compile_flags}": get_starlark_list(
[ [