diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
| commit | 4b959bd8df18a281248c7325a61f4a79ce7691da (patch) | |
| tree | a1ad0e5b950eea62a6eebe4b26e820269654f17c /CMakeLists.txt | |
| parent | 0a7faed75ad49b99bace0882f89e08639c85679b (diff) | |
| parent | acc58fd83584c49049951a2c54c7f82a0c7ec412 (diff) | |
| download | mariadb-git-4b959bd8df18a281248c7325a61f4a79ce7691da.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 68d51c14c5a..8cf62593ae7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,6 +189,7 @@ ENDIF() OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF) INCLUDE(check_compiler_flag) +INCLUDE(check_linker_flag) OPTION(WITH_ASAN "Enable address sanitizer" OFF) @@ -239,7 +240,7 @@ OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protec IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN) # security-enhancing flags MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") + MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now") MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) ENDIF() |