From dfbf5a05648c07e1276d119daad17f8f9b01457a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 12 Nov 2020 20:13:57 +0100 Subject: [PATCH] Omit ARM64 simulator until migration to XCFrameworks Can't lipo arm64 slices for different platforms (iPhoneOS and iPhoneSimulator). --- OpenSSL-Apple.podspec | 4 +++- OpenSSL-Apple.podspec.template | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSSL-Apple.podspec b/OpenSSL-Apple.podspec index 208a1e7..58afa24 100755 --- a/OpenSSL-Apple.podspec +++ b/OpenSSL-Apple.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| openssl_version = "1.1.1h" - openssl_targets = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64" + openssl_targets = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64" script_version = "6" s.name = "OpenSSL-Apple" @@ -19,6 +19,8 @@ Pod::Spec.new do |s| s.ios.deployment_target = "12.0" s.ios.vendored_frameworks = "frameworks/iPhone/openssl.framework" + s.ios.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.ios.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } s.osx.deployment_target = "10.15" s.osx.vendored_frameworks = "frameworks/MacOSX/openssl.framework" s.requires_arc = false diff --git a/OpenSSL-Apple.podspec.template b/OpenSSL-Apple.podspec.template index f332f7d..4b700b3 100755 --- a/OpenSSL-Apple.podspec.template +++ b/OpenSSL-Apple.podspec.template @@ -1,6 +1,6 @@ Pod::Spec.new do |s| openssl_version = "%OPENSSL-VERSION%" - openssl_targets = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64" + openssl_targets = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64" script_version = "6" s.name = "OpenSSL-Apple" @@ -19,6 +19,8 @@ Pod::Spec.new do |s| s.ios.deployment_target = "12.0" s.ios.vendored_frameworks = "frameworks/iPhone/openssl.framework" + s.ios.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.ios.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } s.osx.deployment_target = "10.15" s.osx.vendored_frameworks = "frameworks/MacOSX/openssl.framework" s.requires_arc = false