diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2015-03-11 13:05:03 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2015-03-11 13:05:03 +0400 |
| commit | 52a1b5a8c23ebd068172c3c18a4f11c690fd1a2c (patch) | |
| tree | b81e86288e9d4838d68464fa5d9c0301e825d117 /CMakeLists.txt | |
| parent | 190858d996e7dc90e01fe8a5e7daec6af0012b23 (diff) | |
| download | mariadb-git-52a1b5a8c23ebd068172c3c18a4f11c690fd1a2c.tar.gz | |
MY_CHECK_AND_SET_COMPILER_FLAG changes
* watch for "redefined macro" warning
* don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ca49a9ee4b..48015fa29d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,13 +206,7 @@ IF(SECURITY_HARDENED) MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") - - # sometimes _FORTIFY_SOURCE is predefined - INCLUDE(CheckSymbolExists) - CHECK_SYMBOL_EXISTS(_FORTIFY_SOURCE "" HAVE_FORTIFY_SOURCE) - IF(NOT HAVE_FORTIFY_SOURCE) - ADD_DEFINITIONS(-D_FORTIFY_SOURCE=2) - ENDIF() + MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) ENDIF() OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) |