third_party: try to use openssl 3 everywhere

We now should have XCode 14.2 by default which should no longer require
bitcode.

Signed-off-by: Julian Oes <[email protected]>

Author: julianoes

third_party/openssl/CMakeLists.txt

@@ -39,10 +39,8 @@ if(ANDROID)
         BUILD_COMMAND make
         INSTALL_COMMAND make install_sw
         )
-elseif(IOS)
-    # OpenSSL 3 has issues with bitcode. Let's stay with OpenSSL 1 until we can drop bitcode (with Xcode 14).
-    set(OPENSSL_VERSION 1.1.1u)
 
+elseif(IOS)
     if(${PLATFORM} STREQUAL "OS64")
         set(OPENSSL_PLATFORM "ios64-xcrun")
     elseif(${PLATFORM} STREQUAL "SIMULATOR64")
@@ -53,16 +51,13 @@ elseif(IOS)
 
     message("OPENSSL_PLATFORM set to ${OPENSSL_PLATFORM}")
 
-    if(${ENABLE_BITCODE})
-        set(CFLAGS "-fembed-bitcode")
-    endif()
-
     ExternalProject_add(
         openssl
         URL https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
         PREFIX openssl
-        CONFIGURE_COMMAND <SOURCE_DIR>/Configure ${OPENSSL_PLATFORM} CFLAGS=${CFLAGS} --prefix=${CMAKE_INSTALL_PREFIX} ${OPENSSL_BUILD_TYPE} no-shared
+        CONFIGURE_COMMAND <SOURCE_DIR>/Configure ${OPENSSL_PLATFORM} --prefix=${CMAKE_INSTALL_PREFIX} ${OPENSSL_BUILD_TYPE} no-shared
         )
+
 elseif(CMAKE_CROSSCOMPILING) # This assumes we use dockcross
     if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm")
         set(OPENSSL_PLATFORM "linux-armv4")
@@ -82,6 +77,7 @@ elseif(CMAKE_CROSSCOMPILING) # This assumes we use dockcross
         BUILD_COMMAND make
         INSTALL_COMMAND make install_sw
         )
+
 elseif(MSVC)
     message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
     # Only available from cmake 3.20, for now do it manually.
@@ -97,6 +93,7 @@ elseif(MSVC)
         BUILD_COMMAND set MAKEFLAGS= && nmake
         INSTALL_COMMAND set MAKEFLAGS= && nmake install_sw
         )
+
 else()
     ExternalProject_add(
         openssl