Skip to content

Commit f045e59

Browse files
committed
Merge pull request #2611 from sdasgup3/master
This will make archiving compatible to other archive tools
2 parents 0b84789 + c529006 commit f045e59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ function(_target_merge_static_library dst_target src_target)
345345
add_custom_command(TARGET "${dst_target}" POST_BUILD
346346
COMMAND "${CMAKE_COMMAND}" -E make_directory "${unpack_dir}"
347347
COMMAND cd "${unpack_dir}"
348-
COMMAND "${CMAKE_AR}" -x "$<TARGET_FILE:${src_target}>"
349-
COMMAND "${CMAKE_AR}" -r "$<TARGET_FILE:${dst_target}>" ./*.o
348+
COMMAND "${CMAKE_AR}" x "$<TARGET_FILE:${src_target}>"
349+
COMMAND "${CMAKE_AR}" r "$<TARGET_FILE:${dst_target}>" ./*.o
350350
COMMAND cd "${CMAKE_BINARY_DIR}"
351351
COMMAND "${CMAKE_COMMAND}" -E remove_directory "${unpack_dir}"
352352
)

0 commit comments

Comments
 (0)