Commit c914b2ca authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #4268 from CocoaPods/seg-remove-copy-swift-dylibs

[EmbedFrameworksScript] Only manually copy swift runtime libs in Xcode 6
parents a1204044 f65a5c9f
......@@ -12,6 +12,13 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
appropriate.
[Samuel Giddins](https://github.com/segiddins)
* The embed frameworks script will no longer manually copy over the Swift
runtime libraries on Xcode 7 and later.
[Samuel Giddins](https://github.com/segiddins)
[earltedly](https://github.com/segiddins)
[DJ Tarazona](https://github.com/djtarazona)
[#4188](https://github.com/CocoaPods/CocoaPods/issues/4188)
##### Bug Fixes
* Give a meaningful message for the case where there is no available stable
......
......@@ -79,7 +79,8 @@ module Pod
# Resign the code if required by the build settings to avoid unstable apps
code_sign_if_enabled "${destination}/$(basename "$1")"
# Embed linked Swift runtime libraries
# Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do
......@@ -87,6 +88,7 @@ module Pod
rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
code_sign_if_enabled "${destination}/${lib}"
done
fi
}
# Signs a framework with the provided identity
......
Subproject commit 25e174cdb2644097f47ce19ba3566feca113e527
Subproject commit 93b2f9029b107a7a69dc91b0627fa7c9db779583
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment