diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-10-07 16:06:20 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-10-15 08:10:38 +1100 |
| commit | 8e93d76857e582a4815cf5aee3c740df0854ef38 (patch) | |
| tree | 2e0d7ea1f50a4d7827b457afe81508a11538caf7 | |
| parent | 6504d3d229b086d20e5e4798b1ae10bbbd70d3c7 (diff) | |
| download | mariadb-git-bb-10.1-danielblack-MDEV-23887-check_linker_flags-oldcmakesupport.tar.gz | |
MDEV-23887: check_linker_flags - cmake compatibilitybb-10.1-danielblack-MDEV-23887-check_linker_flags-oldcmakesupport
It was only from CMake-3.14.0 that CMAKE_REQUIRED_LINK_OPTIONS
was used in CHECK_CXX_SOURCE_COMPILES. Without this, it could be
the case (as was on OSX) that a flag was never checked in
CHECK_CXX_SOURCE_COMPILES, it successfully passed, but failed at link
time.
Tested on x86_64 with:
* 3.11.4
* 3.17.4
Corrects: 7473e1841c630d86f1873a2a7afacb53955b3f6f
Reviewer: Sergei Golubchik
| -rw-r--r-- | cmake/check_linker_flag.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/check_linker_flag.cmake b/cmake/check_linker_flag.cmake index ff4b91e89f6..1ea1772d79e 100644 --- a/cmake/check_linker_flag.cmake +++ b/cmake/check_linker_flag.cmake @@ -6,11 +6,11 @@ FUNCTION(MY_CHECK_AND_SET_LINKER_FLAG flag_to_set) RETURN() ENDIF() STRING(REGEX REPLACE "[-,= +]" "_" result "HAVE_LINK_FLAG_${flag_to_set}") - SET(SAVE_CMAKE_REQUIRED_LINK_OPTIONS "${CMAKE_REQUIRED_LINK_OPTIONS}") + SET(SAVE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") STRING(REGEX REPLACE "^-Wno-" "-W" flag_to_check ${flag_to_set}) - SET(CMAKE_REQUIRED_LINK_OPTIONS ${CMAKE_REQUIRED_LINK_OPTIONS} ${flag_to_check}) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${flag_to_check}) CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result}) - SET(CMAKE_REQUIRED_LINK_OPTIONS "${SAVE_CMAKE_REQUIRED_LINK_OPTIONS}") + SET(CMAKE_REQUIRED_LIBRARIES "${SAVE_CMAKE_REQUIRED_LIBRARIES}") IF (${result}) FOREACH(linktype SHARED MODULE EXE) IF(ARGN) |