This is an archive of the discontinued LLVM Phabricator instance.

Differential D145858

Revert "[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag"
ClosedPublic

Authored by fsb4000 on Mar 11 2023, 9:35 PM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rG24416d22bb28: Revert "[CMake] Unify llvm_check_linker_flag and…
Summary

libc++ clang-cl tests failed after that commit

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

Diff Detail

Event Timeline

fsb4000 created this revision.Mar 11 2023, 9:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 11 2023, 9:35 PM
fsb4000 requested review of this revision.Mar 11 2023, 9:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 11 2023, 9:35 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
fsb4000 mentioned this in D145716: [CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag.Mar 11 2023, 10:36 PM
Harbormaster completed remote builds in B218855: Diff 504403.Mar 11 2023, 10:57 PM
This revision was not accepted when it landed; it landed in state Needs Review.Mar 11 2023, 10:59 PM
This revision was landed with ongoing or failed builds.
Closed by commit rG24416d22bb28: Revert "[CMake] Unify llvm_check_linker_flag and… (authored by fsb4000). · Explain Why
This revision was automatically updated to reflect the committed changes.
fsb4000 added a commit: rG24416d22bb28: Revert "[CMake] Unify llvm_check_linker_flag and….

Revision Contents

PathSize
cmake/
Modules/
41 lines

Diff 504409

cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake

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)
cmake_policy(PUSH) # If testing a flag with check_c_compiler_flag, it gets added to the compile
cmake_policy(SET CMP0056 NEW) # command only, but not to the linker command in that test. If the flag
set(_CMAKE_EXE_LINKER_FLAGS_SAVE ${CMAKE_EXE_LINKER_FLAGS}) # is vital for linking to succeed, the test would fail even if it would
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}") # 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
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")
check_cxx_compiler_flag("" ${out_var}) check_cxx_compiler_flag("" ${out_var})
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})
cmake_policy(POP)
endfunction()
endif() endif()
cmake_pop_check_state()
endfunction()