Skip to content

Commit 74d7422

Browse files
Fix imported_library handling on Bazel 5 (#1033)
1 parent df2d1a6 commit 74d7422

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

swift/internal/linking.bzl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,13 +403,28 @@ def register_link_binary_action(
403403
objc.static_framework_names.to_list(),
404404
))
405405

406+
is_bazel_6 = hasattr(apple_common, "link_multi_arch_static_library")
407+
if is_bazel_6:
408+
additional_inputs = objc.static_framework_file
409+
else:
410+
additional_inputs = depset(
411+
transitive = [
412+
objc.static_framework_file,
413+
objc.imported_library,
414+
],
415+
)
416+
dep_link_flags.extend([
417+
lib.path
418+
for lib in objc.imported_library.to_list()
419+
])
420+
406421
linking_contexts.append(
407422
cc_common.create_linking_context(
408423
linker_inputs = depset([
409424
cc_common.create_linker_input(
410425
owner = owner,
411426
user_link_flags = dep_link_flags,
412-
additional_inputs = objc.static_framework_file,
427+
additional_inputs = additional_inputs,
413428
),
414429
]),
415430
),

0 commit comments

Comments
 (0)