WolfSSL : Fix crosscompiling i386 on x86_64, on Linux

MariaDB · Jun 14, 2019 · 4ec302e · 4ec302e
1 parent e22d2cf
commit 4ec302e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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})