Merge pull request #7226 from paulb777/archive-regression

Fix static framework archive regression from #7187

CHANGELOG.md

@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Fix static framework archive regression from #7187  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7225](https://github.com/CocoaPods/CocoaPods/issues/7225)
+
 * Install resource bundles and embed frameworks for every test target's configuration  
   [Nickolay Tarbayev](https://github.com/tarbayev)
   [#7012](https://github.com/CocoaPods/CocoaPods/issues/7012)

lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -471,7 +471,8 @@ module Pod
             build_phase = native_target.new_shell_script_build_phase('Setup Static Framework')
             build_phase.shell_script = <<-eos.strip_heredoc
           mkdir -p "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules"
-          rsync -t "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
+          # The fat library archive is at a file symbolic link when archiving, so use -L option
+          rsync -tL "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
           rsync -t "${MODULEMAP_FILE}" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/module.modulemap"
           # If there's a .swiftmodule, copy it into the framework's Modules folder
           rsync -tr "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}".swiftmodule "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/" 2>/dev/null || :