diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-08-20 09:45:15 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 19:45:15 -0700 |
| commit | 48309ace3e29146a79708dfc4b2e20099221a205 (patch) | |
| tree | 30dcb038bcdde36ec64c26400f36c37f3e7b124b | |
| parent | 0d52f66f47399778b96052bd1c3c9ea3d007e456 (diff) | |
| download | vcpkg-48309ace3e29146a79708dfc4b2e20099221a205.tar.gz vcpkg-48309ace3e29146a79708dfc4b2e20099221a205.zip | |
[openssl-unix] Fix #12919 (#12986)
| -rw-r--r-- | ports/openssl-unix/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/openssl-unix/CONTROL | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/openssl-unix/CMakeLists.txt b/ports/openssl-unix/CMakeLists.txt index c7d7cc32a..a763a8749 100644 --- a/ports/openssl-unix/CMakeLists.txt +++ b/ports/openssl-unix/CMakeLists.txt @@ -40,10 +40,10 @@ set(CFLAGS "${CMAKE_C_FLAGS}") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}")
endif()
-if(CMAKE_C_COMPILER_TARGET)
+if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET)
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}")
endif()
-if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN)
+if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN AND CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN)
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
endif()
if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index da781ab02..9ea5cc309 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,5 +1,5 @@ Source: openssl-unix Version: 1.1.1g -Port-Version: 2 +Port-Version: 3 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. Supports: !(windows|uwp) |