[XCConfig] Ensure FRAMEWORK_SEARCH_PATHS contains $(inherited)

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -58,6 +58,7 @@ module Pod
             'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target, includes_static_libs),
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
           }
           @xcconfig = Xcodeproj::Config.new(config)
 
@@ -112,7 +113,7 @@ module Pod
               build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
             end
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
-              build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
+              build_settings['FRAMEWORK_SEARCH_PATHS'] = '"$PODS_FRAMEWORK_BUILD_PATH"'
             end
             @xcconfig.merge!(build_settings)
           else

lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -55,6 +55,8 @@ module Pod
             # 'USE_HEADERMAP' => 'NO'
           }
 
+          @xcconfig = Xcodeproj::Config.new(config)
+
           if target.requires_frameworks? && target.scoped?
             # Only quote the FRAMEWORK_SEARCH_PATHS entry, because it’s a setting that takes multiple values.
             # In addition, quoting CONFIGURATION_BUILD_DIR would make it be interpreted as a relative path.
@@ -63,10 +65,9 @@ module Pod
               'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
               'CONFIGURATION_BUILD_DIR' => '$PODS_FRAMEWORK_BUILD_PATH',
             }
-            config.merge!(build_settings)
+            @xcconfig.merge!(build_settings)
           end
 
-          @xcconfig = Xcodeproj::Config.new(config)
           XCConfigHelper.add_settings_for_file_accessors_of_target(target, @xcconfig)
           target.file_accessors.each do |file_accessor|
             @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)