Merge pull request #9574 from CocoaPods/amorde/xcframework-macos

Fix an issue when including XCFrameworks in macOS apps
CocoaPods · Mar 1, 2020 · f075f94 · f075f94
2 parents 4d37bbb + 0767fc4
commit f075f94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
+* Fix an issue that caused a build failure with vendored XCFrameworks on macOS  
+  [Eric Amorde](https://github.com/amorde)
+  [#9574](https://github.com/CocoaPods/CocoaPods/pull/9574) 
 
 
 ## 1.9.0 (2020-02-25)

diff --git a/lib/cocoapods/generator/prepare_artifacts_script.rb b/lib/cocoapods/generator/prepare_artifacts_script.rb
@@ -148,7 +148,7 @@ def script
             if [[ "$PLATFORM_NAME" == *"simulator" ]]; then
               target_variant="simulator"
             fi
-            if [[ "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then
+            if [[ ! -z ${EFFECTIVE_PLATFORM_NAME+x} && "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then
               target_variant="maccatalyst"
             fi
             for i in ${!paths[@]}; do

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs