diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-08-18 11:51:47 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 11:51:47 +0400 |
| commit | d0d99dec914d409d7889fcec2efd126edad10bde (patch) | |
| tree | 87e203eabe37a987d7da510a1cfcac4cab0ae92d | |
| parent | 1e160e5cb387900df8c47e87b9378c6e7df05777 (diff) | |
| parent | 2f5ae0fbe76d749518b8f943b61c198e4b9315aa (diff) | |
| download | mariadb-git-d0d99dec914d409d7889fcec2efd126edad10bde.tar.gz | |
Merge pull request #206 from prohaska7/10.1-with-asan
MDEV-10412 fix WITH_ASAN option for 10.1
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ab981bc330f..cc696e36682 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,12 +187,16 @@ IF (WITH_ASAN) # gcc 4.8.1 and new versions of clang MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=address -O1 -Wno-error -fPIC" DEBUG RELWITHDEBINFO) + SET(HAVE_C_FSANITIZE ${HAVE_C__fsanitize_address__O1__Wno_error__fPIC}) + SET(HAVE_CXX_FSANITIZE ${HAVE_CXX__fsanitize_address__O1__Wno_error__fPIC}) IF(HAVE_C_FSANITIZE AND HAVE_CXX_FSANITIZE) SET(WITH_ASAN_OK 1) ELSE() # older versions of clang MY_CHECK_AND_SET_COMPILER_FLAG("-faddress-sanitizer -O1 -fPIC" DEBUG RELWITHDEBINFO) + SET(HAVE_C_FADDRESS ${HAVE_C__faddress_sanitizer__O1__fPIC}) + SET(HAVE_CXX_FADDRESS ${HAVE_CXX__faddress_sanitizer__O1__fPIC}) IF(HAVE_C_FADDRESS AND HAVE_CXX_FADDRESS) SET(WITH_ASAN_OK 1) ENDIF() |