diff options
author | Petr Hosek <phosek@google.com> | 2023-03-28 08:28:17 +0000 |
---|---|---|
committer | Petr Hosek <phosek@google.com> | 2023-03-28 08:28:17 +0000 |
commit | 5304034f0902fcf7996ef1ad611da99e8134d90d (patch) | |
tree | 2e2dcfdda9736204f9ff79c7803f6585f43b660a /cmake | |
parent | cfdcdf05feb26418b3aef5df3ee94492da5eeacd (diff) | |
download | llvm-5304034f0902fcf7996ef1ad611da99e8134d90d.zip llvm-5304034f0902fcf7996ef1ad611da99e8134d90d.tar.gz llvm-5304034f0902fcf7996ef1ad611da99e8134d90d.tar.bz2 |
Revert "[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag"
This reverts commit 55e65ad876e3ac0b1cb0410a5cce3554c009af65.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake b/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake index 2f43870..f61ec05 100644 --- a/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake +++ b/cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake @@ -1,20 +1,28 @@ -include(CheckLinkerFlag OPTIONAL) +include(CMakePushCheckState) -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 +include(CheckCompilerFlag OPTIONAL) +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 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}") + 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 if("${lang}" STREQUAL "C") check_c_compiler_flag("" ${out_var}) elseif("${lang}" STREQUAL "CXX") @@ -22,7 +30,6 @@ else() else() message(FATAL_ERROR "\"${lang}\" is not C or CXX") endif() - set(CMAKE_EXE_LINKER_FLAGS ${_CMAKE_EXE_LINKER_FLAGS_SAVE}) - cmake_policy(POP) - endfunction() -endif() + endif() + cmake_pop_check_state() +endfunction() |