shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag"

Browse Source 
libc++ clang-cl tests failed after that commit

Look at https://buildkite.com/llvm-project/libcxx-ci/builds/20490

Reviewed By: #libc

Differential Revision: https://reviews.llvm.org/D145858

This reverts commit b00aaab730ae8bd7f8a44e1808e668e20c2c9282.
This commit is contained in:
Igor Zhukov 2023-03-12 13:27:23 +07:00
parent 6590a372fa
commit 24416d22bb
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake
View File

@ -1,20 +1,28 @@
include(CheckLinkerFlag OPTIONAL) include(CMakePushCheckState)
if (COMMAND check_linker_flag) include(CheckCompilerFlag OPTIONAL)
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) include(CheckCXXCompilerFlag)
endif()
# cmake builtin compatible, except we assume lang is C or CXX function(llvm_check_compiler_linker_flag lang flag out_var)
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
cmake_policy(PUSH) # command only, but not to the linker command in that test. If the flag
cmake_policy(SET CMP0056 NEW) # is vital for linking to succeed, the test would fail even if it would
set(_CMAKE_EXE_LINKER_FLAGS_SAVE ${CMAKE_EXE_LINKER_FLAGS}) # have succeeded if it was included on both commands.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}") #
# 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
if("${lang}" STREQUAL "C") if("${lang}" STREQUAL "C")
check_c_compiler_flag("" ${out_var}) check_c_compiler_flag("" ${out_var})
elseif("${lang}" STREQUAL "CXX") elseif("${lang}" STREQUAL "CXX")
@ -22,7 +30,6 @@ else()
else() else()
message(FATAL_ERROR "\"${lang}\" is not C or CXX") message(FATAL_ERROR "\"${lang}\" is not C or CXX")
endif() endif()
set(CMAKE_EXE_LINKER_FLAGS ${_CMAKE_EXE_LINKER_FLAGS_SAVE}) endif()
cmake_policy(POP) cmake_pop_check_state()
endfunction() endfunction()
endif()