mirror of https://github.com/microsoft/vcpkg.git
[openssl] Fix x86-osx -> arm64-osx cross-compilation (#18630)
This commit is contained in:
parent
0f05959612
commit
588b1e66f9
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "openssl",
|
||||
"version-string": "1.1.1k",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
|
||||
"homepage": "https://www.openssl.org"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4630,7 +4630,7 @@
|
|||
},
|
||||
"openssl": {
|
||||
"baseline": "1.1.1k",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"openssl-unix": {
|
||||
"baseline": "1.1.1h",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705",
|
||||
"version-string": "1.1.1k",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3",
|
||||
"version-string": "1.1.1k",
|
||||
|
|
|
|||
Loading…
Reference in New Issue