Commit 642d23c2 authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3677 from themackworth/issue2747

Fix building of static libs that depend on other libs
parents df34f79f ad7cd8f0
...@@ -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
......
...@@ -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',
} }
......
...@@ -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
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
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