Commit 3f2a3c60 authored by Boris Bügling's avatar Boris Bügling Committed by Marius Rackwitz

Add LD_RUNPATH_SEARCH_PATHS to generated aggregate XCConfig.

parent d150ac74
...@@ -107,9 +107,30 @@ module Pod ...@@ -107,9 +107,30 @@ module Pod
# See https://github.com/CocoaPods/CocoaPods/issues/1216 # See https://github.com/CocoaPods/CocoaPods/issues/1216
@xcconfig.attributes.delete('USE_HEADERMAP') @xcconfig.attributes.delete('USE_HEADERMAP')
generate_ld_runpath_search_paths if target.requires_frameworks?
@xcconfig @xcconfig
end end
def generate_ld_runpath_search_paths
ld_runpath_search_paths = ['$(inherited)']
if target.platform.symbolic_name == :osx
ld_runpath_search_paths << "'@executable_path/../Frameworks'"
ld_runpath_search_paths << \
if target.native_target.symbol_type == :unit_test_bundle
"'@loader_path/../Frameworks'"
else
"'@loader_path/Frameworks'"
end
else
ld_runpath_search_paths << [
"'@executable_path/Frameworks'",
"'@loader_path/Frameworks'"
]
end
@xcconfig.merge!('LD_RUNPATH_SEARCH_PATHS' => ld_runpath_search_paths.join(' '))
end
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
end end
end end
......
Subproject commit f0b9e27db20a8368544d141813d4cdfeb8d251c6 Subproject commit a0bf3172c81e3a4a745b95c31e800ed7018f055c
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