Merge pull request #6283 from dnkoutso/master

Fix default LD_RUNPATH_SEARCH_PATHS for host targets

CHANGELOG.md

@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Fix default LD_RUNPATH_SEARCH_PATHS for host targets.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6006](https://github.com/CocoaPods/CocoaPods/issues/6006)
+
 * Fix codesigning issues when targets have spaces.   
   [Sam Gammon](https://github.com/sgammon)
   [#6153](https://github.com/CocoaPods/CocoaPods/issues/6153)

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -226,6 +226,7 @@ module Pod
               "'@executable_path/Frameworks'",
               "'@loader_path/Frameworks'",
             ]
+            ld_runpath_search_paths << "'@executable_path/../../Frameworks'" if target.requires_host_target?
           end
           @xcconfig.merge!('LD_RUNPATH_SEARCH_PATHS' => ld_runpath_search_paths.join(' '))
         end

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -241,6 +241,16 @@ module Pod
             @xcconfig.to_hash['OTHER_SWIFT_FLAGS'].should.include '$(inherited) "-D" "COCOAPODS"'
           end
 
+          it 'includes default runpath search path list for a non host target' do
+            @target.stubs(:requires_host_target?).returns(false)
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'"
+          end
+
+          it 'includes default runpath search path list for a host target' do
+            @target.stubs(:requires_host_target?).returns(true)
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' '@executable_path/../../Frameworks'"
+          end
+
           it 'uses the target definition swift version' do
             @target_definition.stubs(:swift_version).returns('0.1')
             @generator.send(:target_swift_version).should == '0.1'