diff options
| author | Petr Hosek <phosek@google.com> | 2023-03-09 18:23:04 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2023-03-28 06:07:35 +0000 |
| commit | 55e65ad876e3ac0b1cb0410a5cce3554c009af65 (patch) | |
| tree | 82b51024cdde8481b8d47a4b30bc15e7e3e5f144 /cmake | |
| parent | 568be31c9e50a7d7263417841ee1b12334529903 (diff) | |
| download | llvm-55e65ad876e3ac0b1cb0410a5cce3554c009af65.tar.gz | |
[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag
These will be replaced by CMake's check_linker_flag once we update
the minimum CMake version 3.20.
Differential Revision: https://reviews.llvm.org/D145716
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake b/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake index f61ec0585f9a..2f438707783d 100644 --- a/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake +++ b/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake @@ -1,28 +1,20 @@ -include(CMakePushCheckState) +include(CheckLinkerFlag OPTIONAL) -include(CheckCompilerFlag OPTIONAL) +if (COMMAND check_linker_flag) + macro(llvm_check_compiler_linker_flag) + check_linker_flag(${ARGN}) + endmacro() +else() + # Until the minimum CMAKE version is 3.18 -if(NOT COMMAND check_compiler_flag) - include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -endif() - -function(llvm_check_compiler_linker_flag lang flag out_var) - # If testing a flag with check_c_compiler_flag, it gets added to the compile - # command only, but not to the linker command in that test. If the flag - # is vital for linking to succeed, the test would fail even if it would - # have succeeded if it was included on both commands. - # - # Therefore, try adding the flag to CMAKE_REQUIRED_FLAGS, which gets - # added to both compiling and linking commands in the tests. - cmake_push_check_state() - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}") - if(COMMAND check_compiler_flag) - check_compiler_flag("${lang}" "" ${out_var}) - else() - # Until the minimum CMAKE version is 3.19 - # cmake builtin compatible, except we assume lang is C or CXX + # cmake builtin compatible, except we assume lang is C or CXX + function(llvm_check_compiler_linker_flag lang flag out_var) + cmake_policy(PUSH) + cmake_policy(SET CMP0056 NEW) + set(_CMAKE_EXE_LINKER_FLAGS_SAVE ${CMAKE_EXE_LINKER_FLAGS}) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}") if("${lang}" STREQUAL "C") check_c_compiler_flag("" ${out_var}) elseif("${lang}" STREQUAL "CXX") @@ -30,6 +22,7 @@ function(llvm_check_compiler_linker_flag lang flag out_var) else() message(FATAL_ERROR "\"${lang}\" is not C or CXX") endif() - endif() - cmake_pop_check_state() -endfunction() + set(CMAKE_EXE_LINKER_FLAGS ${_CMAKE_EXE_LINKER_FLAGS_SAVE}) + cmake_policy(POP) + endfunction() +endif() |