diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2023-02-07 14:04:37 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2023-02-08 11:32:06 +0100 |
| commit | 493f2bca76116c1696d42823e2218b1552aeaf8c (patch) | |
| tree | 23e25734402a2d469913b289d817b7fb4372da53 /extra | |
| parent | 785386c807478919e1c95f87fc8d45a6c5c23817 (diff) | |
| download | mariadb-git-493f2bca76116c1696d42823e2218b1552aeaf8c.tar.gz | |
Add more workaround atop existing WolfSSL 5.5.4 workaround to compile ASAN on buildbot
The -D flag was not passed to asm compiler, despite SET_PROPERTY(COMPILE_OPTIONS)
The exact reason for that remains unknown. It was not seen with gcc, as
nor was be reproduced on newer CMake.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 7bd5f1694ed..0aee5865867 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -12,6 +12,9 @@ IF(MSVC) SET(WOLFSSL_X86_64_BUILD 1) SET(HAVE_INTEL_RDSEED 1) SET(HAVE_INTEL_RDRAND 1) +ELSEIF(CMAKE_ASM_COMPILER_ID MATCHES "Clang" AND CMAKE_VERSION VERSION_LESS 3.16) + + # WolfSSL 5.5.4 bug workaround below does not work, due to some CMake bug ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") SET(WOLFSSL_X86_64_BUILD 1) IF(CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) |