caio/clang-p2996
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 
This reverts commit 55e65ad876.
This commit is contained in:
Petr Hosek
2023-03-28 08:28:17 +00:00
parent cfdcdf05fe
commit 5304034f09
2 changed files with 25 additions and 21 deletions
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()

5
runtimes/CMakeLists.txt
View File

@@ -142,11 +142,8 @@ endif()
# Check for -nostdlib++ first; if there's no C++ standard library yet, # Check for -nostdlib++ first; if there's no C++ standard library yet,
# all check_cxx_compiler_flag commands will fail until we add -nostdlib++ # all check_cxx_compiler_flag commands will fail until we add -nostdlib++
# (or -nodefaultlibs). # (or -nodefaultlibs).
# TODO: Switch to check_linker_flag after raise the minimum CMake version past 3.14. llvm_check_compiler_linker_flag(CXX "-nostdlib++" CXX_SUPPORTS_NOSTDLIBXX_FLAG)
check_cxx_compiler_flag(-nostdlib++ CXX_SUPPORTS_NOSTDLIBXX_FLAG)
if (CXX_SUPPORTS_NOSTDLIBXX_FLAG) if (CXX_SUPPORTS_NOSTDLIBXX_FLAG)
# TODO: This is link only flag and should be added to CMAKE_REQUIRED_LINK_OPTIONS
# but that's only supported since CMake 3.14.
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nostdlib++") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nostdlib++")
endif() endif()
check_cxx_compiler_flag(-nostdinc++ CXX_SUPPORTS_NOSTDINCXX_FLAG) check_cxx_compiler_flag(-nostdinc++ CXX_SUPPORTS_NOSTDINCXX_FLAG)