diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
commit | 53aabda6b5ac6af989a97a00ff97efda9ff8772e (patch) | |
tree | 95867fd8cf7284dd7b2da1882182ceedffbbe683 /extra | |
parent | f614b6ea6112c219581ffc35e753bc1dab48483a (diff) | |
parent | ba679ae52f0e9d698c1b36d28a5bc8c233e57a2e (diff) | |
download | mariadb-git-53aabda6b5ac6af989a97a00ff97efda9ff8772e.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'extra')
-rw-r--r-- | extra/wolfssl/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index dced917169a..e2ba345e3c8 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -12,13 +12,16 @@ IF(MSVC) ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") 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) + MESSAGE_ONCE(MSAN_CANT_HANDLE_IT + "Disable Intel assembly for WolfSSL - MSAN can't handle it") ELSE() MY_CHECK_C_COMPILER_FLAG(-maes) MY_CHECK_C_COMPILER_FLAG(-msse4) MY_CHECK_C_COMPILER_FLAG(-mpclmul) - ENDIF() - IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) - SET(WOLFSSL_INTELASM ON) + IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) + SET(WOLFSSL_INTELASM ON) + ENDIF() ENDIF() ENDIF() ENDIF() |