diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-22 08:34:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-22 08:34:29 +0300 |
| commit | 8ebff3bcb02e4185328542a2755e2f44e79465ec (patch) | |
| tree | e1bb0e30d8aa66545c2a2fb3e05ca0483c9a7964 /configure.cmake | |
| parent | 6680fd8d4b1f5fa8488608ca9e528e56f338dba4 (diff) | |
| parent | 0fa19fdebf0925be6ec5503938d541332f259cb5 (diff) | |
| download | mariadb-git-8ebff3bcb02e4185328542a2755e2f44e79465ec.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 6db53ba6e8f..5b5f2f911c0 100644 --- a/configure.cmake +++ b/configure.cmake @@ -324,7 +324,14 @@ ENDIF() CHECK_FUNCTION_EXISTS (accept4 HAVE_ACCEPT4) CHECK_FUNCTION_EXISTS (access HAVE_ACCESS) CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM) -CHECK_FUNCTION_EXISTS (aligned_alloc HAVE_ALIGNED_ALLOC) +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) |