aboutsummaryrefslogtreecommitdiff
path: root/ports/openssl/unix
diff options
context:
space:
mode:
authorLucius Q. User <31438459+Lucius-Q-User@users.noreply.github.com>2021-07-16 22:51:32 +0300
committerGitHub <noreply@github.com>2021-07-16 12:51:32 -0700
commit588b1e66f9c18e0887eeaea8dfb49ff856acf683 (patch)
tree6579634a6c3da6b0f2f2cfa3ce7b593f218ca87e /ports/openssl/unix
parent0f059596124b7afce437e5dad4588fb3ff06719e (diff)
downloadvcpkg-588b1e66f9c18e0887eeaea8dfb49ff856acf683.tar.gz
vcpkg-588b1e66f9c18e0887eeaea8dfb49ff856acf683.zip
[openssl] Fix x86-osx -> arm64-osx cross-compilation (#18630)
Diffstat (limited to 'ports/openssl/unix')
-rw-r--r--ports/openssl/unix/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index fd8481693..d434cf1f8 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -76,7 +76,9 @@ elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}")
endif()
if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
- set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64"))
+ set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0")
endif()
string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
@@ -168,7 +170,6 @@ if(NOT IOS)
VERBATIM
APPEND
)
-
if(EMSCRIPTEN)
list(APPEND DISABLES
threads