diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 210ded85b5..3acf2f1b72 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -246,7 +246,7 @@ if(CMAKE_CROSSCOMPILING) if(NOT ${apple_toolchain} MATCHES Xcode OR NOT ${apple_sdk} MATCHES "iPhone(OS|Simulator)") message(FATAL_ERROR "didn't find your toolchain and sdk correctly from ${CMAKE_C_COMPILER}/${CMAKE_OSX_SYSROOT}: found toolchain=${apple_toolchain}, sdk=${apple_sdk}") endif() - set(openssl_system_env CROSS_COMPILE=${apple_toolchain} CROSS_TOP=${CMAKE_DEVELOPER_ROOT} CROSS_SDK=${apple_sdk}) + set(openssl_system_env CROSS_COMPILE=${apple_toolchain}/ CROSS_TOP=${CMAKE_DEVELOPER_ROOT} CROSS_SDK=${apple_sdk}) set(openssl_configure_command ./Configure iphoneos-cross) set(openssl_cc "clang") elseif(ARCH_TRIPLET STREQUAL mips64-linux-gnuabi64) diff --git a/contrib/ios/ios-configure.sh b/contrib/ios/ios-configure.sh index b9977dfe46..95127bb4ed 100755 --- a/contrib/ios/ios-configure.sh +++ b/contrib/ios/ios-configure.sh @@ -18,7 +18,7 @@ mkdir -p $targ cmake \ -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE="$root/external/ios-cmake/ios.toolchain.cmake" -DPLATFORM=$plat -DDEPLOYMENT_TARGET=11 -DENABLE_VISIBILITY=ON -DENABLE_BITCODE=OFF \ + -DCMAKE_TOOLCHAIN_FILE="$root/external/ios-cmake/ios.toolchain.cmake" -DPLATFORM=$plat -DDEPLOYMENT_TARGET=13 -DENABLE_VISIBILITY=ON -DENABLE_BITCODE=OFF \ -DCMAKE_CXX_COMPILER_LAUNCHER= -DCMAKE_C_COMPILER_LAUNCHER= \ -DBUILD_STATIC_DEPS=ON \ -DBUILD_PACKAGE=OFF \