2
0
Fork 0
mirror of https://github.com/bazelbuild/rules_cc synced 2024-11-26 20:02:22 +00:00

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`.
This commit is contained in:
Fabian Meumertzheim 2024-10-15 14:28:22 +02:00
parent ba3ec91a55
commit 12a8bd59af
2 changed files with 7 additions and 3 deletions

View file

@ -68,6 +68,11 @@ 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.

View file

@ -628,9 +628,8 @@ 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",
] + ( ]),
[":validate_static_library"] if "validate_static_library" in tool_paths else [] "%{ar_deps}": get_starlark_list([":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(
[ [