Skip to content

Commit

Permalink
Remove direct use of objc linking provider (#2023)
Browse files Browse the repository at this point in the history
This was removed on bazel @ HEAD but still required for supporting older
versions.

Fixes #2020
  • Loading branch information
keith authored Jul 17, 2023
1 parent ce831fd commit 4727155
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions apple/apple_static_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,20 @@ def _apple_static_library_impl(ctx):
collect_data = True,
)

return [
providers = [
DefaultInfo(files = depset(files_to_build), runfiles = runfiles),
AppleBinaryInfo(
binary = link_result.library,
infoplist = None,
),
link_result.objc,
link_result.output_groups,
]

if link_result.objc:
providers.append(link_result.objc)

return providers

apple_static_library = rule(
implementation = _apple_static_library_impl,
attrs = dicts.add(
Expand Down
4 changes: 2 additions & 2 deletions apple/internal/linking_support.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def _register_binary_linking_action(
binary = fat_binary,
cc_info = linking_outputs.cc_info,
debug_outputs_provider = linking_outputs.debug_outputs_provider,
objc = linking_outputs.objc,
objc = getattr(linking_outputs, "objc", None),
outputs = linking_outputs.outputs,
output_groups = linking_outputs.output_groups,
)
Expand Down Expand Up @@ -253,7 +253,7 @@ def _register_static_library_linking_action(ctx):

return struct(
library = fat_library,
objc = linking_outputs.objc,
objc = getattr(linking_outputs, "objc", None),
outputs = linking_outputs.outputs,
output_groups = linking_outputs.output_groups,
)
Expand Down

0 comments on commit 4727155

Please sign in to comment.