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
642d23c2
Commit
642d23c2
authored
Jun 17, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3677 from themackworth/issue2747
Fix building of static libs that depend on other libs
parents
df34f79f
ad7cd8f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
CHANGELOG.md
CHANGELOG.md
+7
-0
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+0
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+0
-3
No files found.
CHANGELOG.md
View file @
642d23c2
...
@@ -64,6 +64,13 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -64,6 +64,13 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Vincent Isambart
](
https://github.com/vincentisambart
)
[
Vincent Isambart
](
https://github.com/vincentisambart
)
[
#3161
](
https://github.com/CocoaPods/CocoaPods/issues/3161
)
[
#3161
](
https://github.com/CocoaPods/CocoaPods/issues/3161
)
*
Fixes an issue that prevented static libraries from building.
`OTHER_LIBTOOLFLAGS`
is no longer set to the value of
`OTHER_LDFLAGS`
. If you want to create a static
library that includes all dependencies for (internal/external) distribution then
you should use a tool like
`cocoapods-packager`
.
[
Michael Moscardini
](
https://github.com/themackworth
)
[
#2747
](
https://github.com/CocoaPods/CocoaPods/issues/2747
)
[
#2704
](
https://github.com/CocoaPods/CocoaPods/issues/2704
)
## 0.37.2
## 0.37.2
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
642d23c2
...
@@ -52,7 +52,6 @@ module Pod
...
@@ -52,7 +52,6 @@ module Pod
pod_targets
=
target
.
pod_targets_for_build_configuration
(
@configuration_name
)
pod_targets
=
target
.
pod_targets_for_build_configuration
(
@configuration_name
)
config
=
{
config
=
{
'OTHER_LDFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
default_ld_flags
(
target
),
'OTHER_LDFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
default_ld_flags
(
target
),
'OTHER_LIBTOOLFLAGS'
=>
'$(OTHER_LDFLAGS)'
,
'PODS_ROOT'
=>
target
.
relative_pods_root
,
'PODS_ROOT'
=>
target
.
relative_pods_root
,
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'$(inherited) COCOAPODS=1'
,
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'$(inherited) COCOAPODS=1'
,
}
}
...
...
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
642d23c2
...
@@ -62,9 +62,6 @@ module Pod
...
@@ -62,9 +62,6 @@ module Pod
@xcconfig
.
to_hash
[
'GCC_PREPROCESSOR_DEFINITIONS'
].
should
.
include
'$(inherited)'
@xcconfig
.
to_hash
[
'GCC_PREPROCESSOR_DEFINITIONS'
].
should
.
include
'$(inherited)'
end
end
it
'should configure OTHER_LIBTOOLFLAGS flags to include OTHER_LDFLAGS'
do
@xcconfig
.
to_hash
[
'OTHER_LIBTOOLFLAGS'
].
should
==
'$(OTHER_LDFLAGS)'
end
end
end
#-----------------------------------------------------------------------#
#-----------------------------------------------------------------------#
...
...
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