diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-14 15:49:38 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-14 15:49:38 +0200 |
| commit | 4ec302ebf86ed2f36bd072ee5b43f5e2b724136b (patch) | |
| tree | 54dc89761c516574a1bb86d9b7e88decda9f4ec5 /extra | |
| parent | e22d2cfe58bac9847dbaa1f03827fe8ea564d443 (diff) | |
| download | mariadb-git-4ec302ebf86ed2f36bd072ee5b43f5e2b724136b.tar.gz | |
WolfSSL : Fix crosscompiling i386 on x86_64, on Linux
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index cf6715280e3..f3f09f631d7 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -6,7 +6,8 @@ ELSE() PROJECT(wolfssl C) ENDIF() -IF(MSVC AND (CMAKE_SIZEOF_VOID_P MATCHES 8)) +IF(CMAKE_SIZEOF_VOID_P MATCHES 8) +IF(MSVC) SET(WOLFSSL_INTELASM ON) ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") IF(CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) @@ -20,6 +21,7 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") SET(WOLFSSL_INTELASM ON) ENDIF() ENDIF() +ENDIF() SET(WOLFSSL_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/src) ADD_DEFINITIONS(${SSL_DEFINES}) |