diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 09:29:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 09:29:05 +0300 |
| commit | d7c82610c14f5102258640c73c1d78ea22f942c3 (patch) | |
| tree | 7d4a253e173aa202073843f0e55c098962d74dbd | |
| parent | 61df98f9642c1616f872d61808ce6d010fe35b44 (diff) | |
| download | mariadb-git-d7c82610c14f5102258640c73c1d78ea22f942c3.tar.gz | |
Fix the WolfSSL build on FreeBSD
Port some CMake tweaks of commit 4adc1269cc2d487bb12f96b0827c4a74f1a05382
from 10.5.
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 12eb26c9ef7..953d377ebcf 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -1,6 +1,6 @@ IF(MSVC) PROJECT(wolfssl C ASM_MASM) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") PROJECT(wolfssl C ASM) ELSE() PROJECT(wolfssl C) @@ -9,7 +9,7 @@ ENDIF() IF(CMAKE_SIZEOF_VOID_P MATCHES 8) IF(MSVC) SET(WOLFSSL_INTELASM ON) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") IF(CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) MESSAGE_ONCE(NO_INTEL_ASSEMBLY "Disable Intel assembly for WolfSSL - compiler is too old") ELSEIF(WITH_MSAN) @@ -121,7 +121,7 @@ IF(WOLFSSL_INTELASM) IF(CMAKE_C_COMPILER_ID MATCHES Clang) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -msse4.2 -mpclmul -mrdrnd -mrdseed") ENDIF() - ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") + ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") SET(USE_INTEL_SPEEDUP 1) LIST(APPEND WOLFCRYPT_SOURCES ${WOLFCRYPT_SRCDIR}/aes_asm.S |