[futurepress#39] iOS: Ensures PCRE2 is build for both x86_64 and arm6…

…4 archs
smellman · May 18, 2023 · e0efcfd · e0efcfd
1 parent b6e2069
commit e0efcfd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
     -DCMAKE_OSX_ARCHITECTURES=${ESCAPED_ARCHS}
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-    -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=${CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH}
     -DCMAKE_IOS_INSTALL_COMBINED=${CMAKE_IOS_INSTALL_COMBINED}
     -GXcode
   )

diff --git a/dr-pogodin-react-native-static-server.podspec b/dr-pogodin-react-native-static-server.podspec
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
 
       if [[ ${PLATFORM_FAMILY_NAME} == "iOS" ]]
       then
-        EXTRA_CONFIG_ARGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET} -DCMAKE_SYSTEM_NAME=iOS -GXcode"
+        EXTRA_CONFIG_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET} -DCMAKE_SYSTEM_NAME=iOS -GXcode"
         BUILD_OUTPUT_FOLDER_LIGHTTPD="/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}"
         BUILD_OUTPUT_FOLDER_PCRE2="/Release${EFFECTIVE_PLATFORM_NAME}"
       else

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -488,7 +488,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  dr-pogodin-react-native-static-server: 70d8f8c252de4533e8ce063dac6587d1d6a751c8
+  dr-pogodin-react-native-static-server: f407ee9d08b9575532876f72f2ab3b231764c60f
   FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
   FBReactNativeSpec: 0d9a4f4de7ab614c49e98c00aedfd3bfbda33d59
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9