diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:11:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:11:59 +0300 |
| commit | acc58fd83584c49049951a2c54c7f82a0c7ec412 (patch) | |
| tree | 67f46432ebc28c825b370f04c387a06b942cbbc6 /CMakeLists.txt | |
| parent | 2cae58f8918f64c77227cfa07ab2fd24c3580f81 (diff) | |
| parent | ca9276e37ea29468406d5ec7c17d2ad5c032637f (diff) | |
| download | mariadb-git-acc58fd83584c49049951a2c54c7f82a0c7ec412.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c22af70e2..6cf94a01e95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2017, Oracle and/or its affiliates. -# Copyright (c) 2008, 2019, MariaDB Corporation. +# Copyright (c) 2008, 2020, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -183,6 +183,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) @@ -245,7 +246,7 @@ IF(NOT WITH_TSAN) 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() |