factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove CMAKE_HOST_ references

Browse Source 
CMAKE_HOST_ describes the host system not the target. For cross compilation to work the actual target system should be used for making decisions in CMake.
This commit is contained in:
Don 2018-03-16 14:59:53 -07:00
parent 639a6629ae
commit 09590953d0
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -279,7 +279,7 @@ else()
set(OPENSSL_LIBS tls ssl crypto) set(OPENSSL_LIBS tls ssl crypto)
endif() endif()
if(CMAKE_HOST_WIN32) if(WIN32)
set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32)
endif() endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux") if(CMAKE_SYSTEM_NAME MATCHES "Linux")

4
apps/openssl/CMakeLists.txt
View File

@ -55,12 +55,12 @@ set(
x509.c x509.c
) )
if(CMAKE_HOST_UNIX) if(UNIX)
set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c) set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c)
set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c) set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c)
endif() endif()
if(CMAKE_HOST_WIN32) if(WIN32)
set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c) set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c)
set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c) set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c)
set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c)

12
crypto/CMakeLists.txt
View File

@ -643,19 +643,19 @@ set(
x509v3/v3err.c x509v3/v3err.c
) )
if(CMAKE_HOST_UNIX) if(UNIX)
set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c)
set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c)
set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c)
endif() endif()
if(CMAKE_HOST_WIN32) if(WIN32)
set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
endif() endif()
if(CMAKE_HOST_WIN32) if(WIN32)
set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c)
set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday) set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday)
set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror) set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror)
@ -732,7 +732,7 @@ if(NOT HAVE_TIMEGM)
endif() endif()
if(NOT HAVE_EXPLICIT_BZERO) if(NOT HAVE_EXPLICIT_BZERO)
if(CMAKE_HOST_WIN32) if(WIN32)
set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c)
else() else()
set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c)
@ -749,7 +749,7 @@ if(NOT HAVE_ARC4RANDOM_BUF)
set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform)
if(NOT HAVE_GETENTROPY) if(NOT HAVE_GETENTROPY)
if(CMAKE_HOST_WIN32) if(WIN32)
set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c)
elseif(CMAKE_SYSTEM_NAME MATCHES "AIX") elseif(CMAKE_SYSTEM_NAME MATCHES "AIX")
set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c) set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c)
@ -783,7 +783,7 @@ endif()
if(NOT ENABLE_ASM) if(NOT ENABLE_ASM)
add_definitions(-DOPENSSL_NO_ASM) add_definitions(-DOPENSSL_NO_ASM)
else() else()
if(CMAKE_HOST_WIN32) if(WIN32)
add_definitions(-DOPENSSL_NO_ASM) add_definitions(-DOPENSSL_NO_ASM)
endif() endif()
endif() endif()

2
tests/CMakeLists.txt
View File

@ -163,7 +163,7 @@ add_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt)
# explicit_bzero # explicit_bzero
# explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows
if(NOT CMAKE_HOST_WIN32) if(NOT WIN32)
if(HAVE_MEMMEM) if(HAVE_MEMMEM)
add_executable(explicit_bzero explicit_bzero.c) add_executable(explicit_bzero explicit_bzero.c)
else() else()

18
tls/CMakeLists.txt
View File

@ -19,15 +19,15 @@ set(
tls_verify.c tls_verify.c
) )
if(CMAKE_HOST_WIN32) if(WIN32)
set( set(
TLS_SRC TLS_SRC
${TLS_SRC} ${TLS_SRC}
compat/ftruncate.c compat/ftruncate.c
compat/getuid.c compat/getuid.c
compat/pread.c compat/pread.c
compat/pwrite.c compat/pwrite.c
) )
endif() endif()
if(NOT "${OPENSSLDIR}" STREQUAL "") if(NOT "${OPENSSLDIR}" STREQUAL "")