Skip to content

Commit bbd02a8

Browse files
comiuscopybara-github
authored andcommitted
Migrate away from compilation_outputs.files_to_compile
The same information is available in other fields. This prevents regression when compilation_outputs are rewritten to Starlark. PiperOrigin-RevId: 805762499 Change-Id: Ia8af06c280ddf016bde984577c224edc28c0dbdf
1 parent 4169f9d commit bbd02a8

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,16 @@ def _build_output_groups_for_emitting_compile_providers(
239239
process_hdrs = cpp_configuration.process_headers_in_dependencies()
240240
use_pic = cc_toolchain.needs_pic_for_dynamic_libraries(feature_configuration = feature_configuration)
241241
output_groups_builder["temp_files_INTERNAL_"] = compilation_outputs.temps()
242-
files_to_compile = compilation_outputs.files_to_compile(
243-
parse_headers = process_hdrs,
244-
use_pic = use_pic,
245-
)
242+
if hasattr(compilation_outputs, "files_to_compile"):
243+
files_to_compile = compilation_outputs.files_to_compile(
244+
parse_headers = process_hdrs,
245+
use_pic = use_pic,
246+
)
247+
else:
248+
files_to_compile = compilation_outputs.pic_objects if use_pic else compilation_outputs.objects
249+
if process_hdrs:
250+
files_to_compile = files_to_compile + compilation_outputs.header_tokens()
251+
files_to_compile = depset(files_to_compile)
246252
output_groups_builder["compilation_outputs"] = files_to_compile
247253
output_groups_builder["compilation_prerequisites_INTERNAL_"] = _collect_compilation_prerequisites(ctx = ctx, compilation_context = compilation_context)
248254
output_groups_builder["module_files"] = depset(compilation_outputs.module_files())

0 commit comments

Comments
 (0)