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
905f032b
Commit
905f032b
authored
Mar 28, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix generating without but consuming a vendored dynamic artifact.
parent
6a6df6f0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
CHANGELOG.md
CHANGELOG.md
+4
-0
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+5
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+5
-0
No files found.
CHANGELOG.md
View file @
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
)
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
905f032b
...
...
@@ -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
...
...
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
905f032b
...
...
@@ -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
...
...
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