Merge pull request #3757 from CocoaPods/seg-ld-objc

[XCConfig] Only include -ObjC flag when linking against a static lib

CHANGELOG.md

@@ -38,6 +38,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Samuel Giddins](https://github.com/segiddins)
   [#3754](https://github.com/CocoaPods/CocoaPods/issues/3754)
 
+* Don't add the `-ObjC` linker flag if it's unnecessary.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3537](https://github.com/CocoaPods/CocoaPods/issues/3537)
+
 
 ## 0.38.0.beta.1
 

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -49,8 +49,10 @@ module Pod
         # @return [Xcodeproj::Config]
         #
         def generate
+          includes_static_libs = !target.requires_frameworks?
+          includes_static_libs ||= target.pod_targets.flat_map(&:file_accessors).any? { |fa| !fa.vendored_libraries.empty? }
           config = {
-            'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target),
+            'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target, includes_static_libs),
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
           }

lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -31,13 +31,14 @@ module Pod
         #         while `-fobjc-arc` is included only if requested in the
         #         Podfile.
         #
-        def self.default_ld_flags(target)
-          ld_flags = '-ObjC'
+        def self.default_ld_flags(target, includes_static_libraries = false)
+          ld_flags = ''
+          ld_flags << '-ObjC' if includes_static_libraries
           if target.podfile.set_arc_compatibility_flag? &&
               target.spec_consumers.any?(&:requires_arc?)
             ld_flags << ' -fobjc-arc'
           end
-          ld_flags
+          ld_flags.strip
         end
 
         # Configures the given Xcconfig

cocoapods-integration-specs @ 99cf7a48

-Subproject commit 6d4b38764f551fcda4da634ba777640d96162b56
+Subproject commit 99cf7a48d31f8d48aff0266d46ae950b4c28d804

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -38,10 +38,6 @@ module Pod
             @xcconfig.class.should == Xcodeproj::Config
           end
 
-          it 'configures the project to load all members that implement Objective-c classes or categories' do
-            @xcconfig.to_hash['OTHER_LDFLAGS'].should.include '-ObjC'
-          end
-
           it 'does not add the -fobjc-arc to OTHER_LDFLAGS by default as Xcode 4.3.2 does not support it' do
             @consumer.stubs(:requires_arc?).returns(true)
             @xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include('-fobjc-arc')
@@ -97,6 +93,10 @@ module Pod
 
           behaves_like 'AggregateXCConfig'
 
+          it 'configures the project to load all members that implement Objective-c classes or categories' do
+            @xcconfig.to_hash['OTHER_LDFLAGS'].should.include '-ObjC'
+          end
+
           it 'adds the sandbox public headers search paths to the xcconfig, with quotes, as header search paths' do
             expected = "$(inherited) \"#{config.sandbox.public_headers.search_paths(:ios).join('" "')}\""
             @xcconfig.to_hash['HEADER_SEARCH_PATHS'].should == expected
@@ -141,6 +141,10 @@ module Pod
 
           behaves_like 'AggregateXCConfig'
 
+          it "doesn't configure the project to load all members that implement Objective-c classes or categories" do
+            @xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include '-ObjC'
+          end
+
           describe 'with a vendored-library pod' do
             def spec
               fixture_spec('monkey/monkey.podspec')
@@ -149,6 +153,10 @@ module Pod
             it 'does not add the framework build path to the xcconfig' do
               @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.be.nil?
             end
+
+            it 'configures the project to load all members that implement Objective-c classes or categories' do
+              @xcconfig.to_hash['OTHER_LDFLAGS'].should.include '-ObjC'
+            end
           end
 
           it 'sets the PODS_FRAMEWORK_BUILD_PATH build variable' do

spec/unit/generator/xcconfig/private_pod_xcconfig_spec.rb

@@ -19,8 +19,8 @@ module Pod
             @xcconfig.class.should == Xcodeproj::Config
           end
 
-          it 'configures the project to load all members that implement Objective-c classes or categories from the static library' do
-            @xcconfig.to_hash['OTHER_LDFLAGS'].should.include '-ObjC'
+          it 'does not configure the project to load all members that implement Objective-c classes or categories from the static library' do
+            @xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include '-ObjC'
           end
 
           it 'does not add the -fobjc-arc to OTHER_LDFLAGS by default as Xcode 4.3.2 does not support it' do

spec/unit/generator/xcconfig/xcconfig_helper_spec.rb

@@ -15,6 +15,9 @@ module Pod
             podfile = stub(:set_arc_compatibility_flag? => false)
             target = stub(:podfile => podfile)
             result = @sut.default_ld_flags(target)
+            result.should == ''
+
+            result = @sut.default_ld_flags(target, true)
             result.should == '-ObjC'
           end
 
@@ -23,6 +26,9 @@ module Pod
             spec_consumer = stub(:requires_arc? => true)
             target = stub(:podfile => podfile, :spec_consumers => [spec_consumer])
             result = @sut.default_ld_flags(target)
+            result.should == '-fobjc-arc'
+
+            result = @sut.default_ld_flags(target, true)
             result.should == '-ObjC -fobjc-arc'
           end
         end