diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 14:53:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 14:53:24 +0300 |
| commit | ca9276e37ea29468406d5ec7c17d2ad5c032637f (patch) | |
| tree | 993694268974407425e53edfb4dcd10a04c2258e /CMakeLists.txt | |
| parent | a1e52e7f32cee7c204078db4c4beb88250d7e1f6 (diff) | |
| parent | 57ec42bc321dee796ce8e711a4499cd665513009 (diff) | |
| download | mariadb-git-ca9276e37ea29468406d5ec7c17d2ad5c032637f.tar.gz | |
Merge 10.1 into 10.2
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 13d9b1be546..4734c6f7d5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,6 +187,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) IF (WITH_ASAN) @@ -239,7 +240,7 @@ IF(SECURITY_HARDENED) ENDIF() # 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() |