Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
3f2a3c60
Commit
3f2a3c60
authored
Dec 24, 2014
by
Boris Bügling
Committed by
Marius Rackwitz
Dec 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add LD_RUNPATH_SEARCH_PATHS to generated aggregate XCConfig.
parent
d150ac74
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+21
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
3f2a3c60
...
...
@@ -107,9 +107,30 @@ module Pod
# See https://github.com/CocoaPods/CocoaPods/issues/1216
@xcconfig
.
attributes
.
delete
(
'USE_HEADERMAP'
)
generate_ld_runpath_search_paths
if
target
.
requires_frameworks?
@xcconfig
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
...
...
cocoapods-integration-specs
@
a0bf3172
Subproject commit
f0b9e27db20a8368544d141813d4cdfeb8d251c6
Subproject commit
a0bf3172c81e3a4a745b95c31e800ed7018f055c
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment