Commit 12518e02 authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #6597 from dnkoutso/runtime_paths

Fix generating LD_RUNPATH_SEARCH_PATHS without use_frameworks! but consuming a vendored dynamic artifact. 
parents 6a6df6f0 905f032b
......@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
* Fix generating `LD_RUNPATH_SEARCH_PATHS` without `use_frameworks!` but consuming a vendored dynamic artifact.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6596](https://github.com/CocoaPods/CocoaPods/issues/6596)
* Fix building with static lib subprojects (previously only supported framework subprojects).
[Ben Asher](https://github.com/benasher44)
[#5830](https://github.com/CocoaPods/CocoaPods/issues/5830)
......
......@@ -80,7 +80,11 @@ module Pod
# See https://github.com/CocoaPods/CocoaPods/issues/1216
@xcconfig.attributes.delete('USE_HEADERMAP')
generate_ld_runpath_search_paths if target.requires_frameworks?
# If any of the aggregate target dependencies bring in any vendored dynamic artifacts we should ensure to
# update the runpath search paths.
vendored_dynamic_artifacts = pod_targets.flat_map(&:file_accessors).flat_map(&:vendored_dynamic_artifacts)
generate_ld_runpath_search_paths if target.requires_frameworks? || vendored_dynamic_artifacts.count > 0
@xcconfig
end
......
......@@ -218,6 +218,11 @@ module Pod
expected = '$(inherited)'
@xcconfig.to_hash['HEADER_SEARCH_PATHS'].should.include expected
end
it 'includes default runpath search path list when not using frameworks but links a vendored dynamic framework' do
@target.stubs(:requires_frameworks?).returns(false)
@generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'"
end
end
describe 'with a scoped pod target' do
......
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