Merge pull request #3027 from patcheng/feature/inherited

prepended $(inherited) to OTHER_LDFLAGS and HEADER_SEARCH_PATHS to the generated xcconfig

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -49,7 +49,7 @@ module Pod
         def generate
           pod_targets = target.pod_targets_for_build_configuration(@configuration_name)
           config = {
-            'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+            'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target),
             'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
@@ -70,7 +70,7 @@ module Pod
             header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
             build_settings = {
               # by `#import "…"`
-              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
+              'HEADER_SEARCH_PATHS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths),
               # by `#import <…>`
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem'),
             }

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -98,7 +98,7 @@ module Pod
           behaves_like 'AggregateXCConfig'
 
           it 'adds the sandbox public headers search paths to the xcconfig, with quotes, as header search paths' do
-            expected = "\"#{config.sandbox.public_headers.search_paths(:ios).join('" "')}\""
+            expected = "$(inherited) \"#{config.sandbox.public_headers.search_paths(:ios).join('" "')}\""
             @xcconfig.to_hash['HEADER_SEARCH_PATHS'].should == expected
           end