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
c5a96f45
Commit
c5a96f45
authored
Dec 07, 2016
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix default LD_RUNPATH_SEARCH_PATHS for host targets
parent
d645df5e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
CHANGELOG.md
CHANGELOG.md
+4
-0
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+1
-0
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+10
-0
No files found.
CHANGELOG.md
View file @
c5a96f45
...
@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### 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.
*
Fix codesigning issues when targets have spaces.
[
Sam Gammon
](
https://github.com/sgammon
)
[
Sam Gammon
](
https://github.com/sgammon
)
[
#6153
](
https://github.com/CocoaPods/CocoaPods/issues/6153
)
[
#6153
](
https://github.com/CocoaPods/CocoaPods/issues/6153
)
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
c5a96f45
...
@@ -226,6 +226,7 @@ module Pod
...
@@ -226,6 +226,7 @@ module Pod
"'@executable_path/Frameworks'"
,
"'@executable_path/Frameworks'"
,
"'@loader_path/Frameworks'"
,
"'@loader_path/Frameworks'"
,
]
]
ld_runpath_search_paths
<<
"'@executable_path/../../Frameworks'"
if
target
.
requires_host_target?
end
end
@xcconfig
.
merge!
(
'LD_RUNPATH_SEARCH_PATHS'
=>
ld_runpath_search_paths
.
join
(
' '
))
@xcconfig
.
merge!
(
'LD_RUNPATH_SEARCH_PATHS'
=>
ld_runpath_search_paths
.
join
(
' '
))
end
end
...
...
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
c5a96f45
...
@@ -241,6 +241,16 @@ module Pod
...
@@ -241,6 +241,16 @@ module Pod
@xcconfig
.
to_hash
[
'OTHER_SWIFT_FLAGS'
].
should
.
include
'$(inherited) "-D" "COCOAPODS"'
@xcconfig
.
to_hash
[
'OTHER_SWIFT_FLAGS'
].
should
.
include
'$(inherited) "-D" "COCOAPODS"'
end
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
it
'uses the target definition swift version'
do
@target_definition
.
stubs
(
:swift_version
).
returns
(
'0.1'
)
@target_definition
.
stubs
(
:swift_version
).
returns
(
'0.1'
)
@generator
.
send
(
:target_swift_version
).
should
==
'0.1'
@generator
.
send
(
:target_swift_version
).
should
==
'0.1'
...
...
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