Revert "Remove Xcode 12 hack"

This reverts commit ed4c58a. As long as we ship a carthage archive we need that hack, otherwise it will try to build for both simulator and hardware ARM, failing to merge them together.
mozilla · Dec 7, 2021 · 225c69d · 225c69d
1 parent f520d78
commit 225c69d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/bin/build-carthage.sh b/bin/build-carthage.sh
@@ -10,6 +10,8 @@ FRAMEWORK_NAME="${1:-Glean}"
 CONFIGURATION="${2:-Release}"
 
 WORKSPACE_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )"
+XCODE_XCCONFIG_FILE="$WORKSPACE_ROOT/xcconfig/xcode-12-fix-carthage-lipo.xcconfig"
+export XCODE_XCCONFIG_FILE
 
 set -o pipefail && \
     carthage build --archive --platform iOS --cache-builds --verbose --configuration "${CONFIGURATION}" "${FRAMEWORK_NAME}" | \

diff --git a/xcconfig/xcode-12-fix-carthage-lipo.xcconfig b/xcconfig/xcode-12-fix-carthage-lipo.xcconfig
@@ -0,0 +1,6 @@
+// Carthage has an issue with XCode 12 architecture changes which doesn't allow
+// it to compile dependencies for proper architecture. This works around it.
+// Ref https://github.com/Carthage/Carthage/issues/3019
+EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8
+EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
+IPHONEOS_DEPLOYMENT_TARGET=11.4