Commit 2bdaa27c authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3737 from CocoaPods/seg-embed-frameworks

Fixes an issue which prevented using a custom `CONFIGURATION_BUILD_DIR` when integrating CocoaPods via dynamic frameworks.
parents c3dac7f9 79d05042
...@@ -130,6 +130,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -130,6 +130,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
options. options.
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
* Fixes an issue which prevented using a custom `CONFIGURATION_BUILD_DIR` when
integrating CocoaPods via dynamic frameworks.
[Tim Rosenblatt](https://github.com/timrosenblatt)
[#3675](https://github.com/CocoaPods/CocoaPods/pull/3675)
## 0.37.2 ## 0.37.2
......
...@@ -45,7 +45,12 @@ module Pod ...@@ -45,7 +45,12 @@ module Pod
install_framework() install_framework()
{ {
local source="${BUILT_PRODUCTS_DIR}/$1" if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
local source="${BUILT_PRODUCTS_DIR}/$1"
else
local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
fi
local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
if [ -L "${source}" ]; then if [ -L "${source}" ]; then
......
Subproject commit 9793ea0fa86ceb9656ed768e58fa3d6db1407dd7 Subproject commit e2492301c53cf7ad83e89dbebdd772254dd0fe15
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