Skip to content

Commit fb48aa2

Browse files
fix: Add missing assembly src files to ObjCxx (#1441)
Assembly files like `.S` are allowed in `srcs` of `objc_library` but we were dropping these because it was only being handled in the `else` case where we do not have Objective-C srcs. A package that requires this change to build is: https://github.com/microsoft/plcrashreporter. I did not add an example of that here because it unfortunately still does not build in sandbox mode (because of issues with the `Package.swift` using `excludes`, I can work on updating the package and adding the example here at a later time). [See this change for how it was done before we split the targets](6d12d53#diff-b4f84bf6654c556e5a44572cef98ce510f12dfea788eed39432b9af5f3e4559dL21) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent b194745 commit fb48aa2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

swiftpkg/internal/swiftpkg_build_files.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,8 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target):
511511
name = child_name,
512512
attrs = attrs,
513513
rule_kind = rule_kind,
514-
srcs = clang_src_info.organized_srcs.cxx_srcs +
514+
srcs = clang_src_info.organized_srcs.assembly_srcs +
515+
clang_src_info.organized_srcs.cxx_srcs +
515516
clang_src_info.organized_srcs.objcxx_srcs +
516517
clang_src_info.organized_srcs.other_srcs +
517518
res_objcxx_srcs,

0 commit comments

Comments
 (0)