Skip to content

This will make archiving compatible to other archive tools #2611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2016
Merged

This will make archiving compatible to other archive tools #2611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ function(_target_merge_static_library dst_target src_target)
add_custom_command(TARGET "${dst_target}" POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "${unpack_dir}"
COMMAND cd "${unpack_dir}"
COMMAND "${CMAKE_AR}" -x "$<TARGET_FILE:${src_target}>"
COMMAND "${CMAKE_AR}" -r "$<TARGET_FILE:${dst_target}>" ./*.o
COMMAND "${CMAKE_AR}" x "$<TARGET_FILE:${src_target}>"
COMMAND "${CMAKE_AR}" r "$<TARGET_FILE:${dst_target}>" ./*.o
COMMAND cd "${CMAKE_BINARY_DIR}"
COMMAND "${CMAKE_COMMAND}" -E remove_directory "${unpack_dir}"
)
Expand Down