diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-24 09:22:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-24 09:22:34 +0300 |
commit | bdd80e3fb1cb653c367099639bec46840eca86e1 (patch) | |
tree | ab3d208ab5102d7f7db1b222a7a4531012a0ebcd /configure.cmake | |
parent | dc11fd07fdaf7316d340569f97a84fa0fd2d307e (diff) | |
parent | 5b4c832c7ebd59d9f5a5e7feef570568e20e5b86 (diff) | |
download | mariadb-git-bdd80e3fb1cb653c367099639bec46840eca86e1.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'configure.cmake')
-rw-r--r-- | configure.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/configure.cmake b/configure.cmake index 98bc2ad73c0..46da0363689 100644 --- a/configure.cmake +++ b/configure.cmake @@ -326,14 +326,6 @@ ENDIF() CHECK_FUNCTION_EXISTS (accept4 HAVE_ACCEPT4) CHECK_FUNCTION_EXISTS (access HAVE_ACCESS) CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM) -IF (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT WITH_ASAN) - # When an old custom memory allocator library is used, aligned_alloc() - # could invoke the built-in allocator in libc, not matching - # the overriden free() in the custom memory allocator. - SET(HAVE_ALIGNED_ALLOC 0) -ELSE() - CHECK_FUNCTION_EXISTS (aligned_alloc HAVE_ALIGNED_ALLOC) -ENDIF() SET(HAVE_ALLOCA 1) CHECK_FUNCTION_EXISTS (backtrace HAVE_BACKTRACE) CHECK_FUNCTION_EXISTS (backtrace_symbols HAVE_BACKTRACE_SYMBOLS) |