[openssl-unix] Fix #12919 (#12986)

microsoft · Aug 20, 2020 · 48309ac · 48309ac
1 parent 0d52f66
commit 48309ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)