This is an archive of the discontinued LLVM Phabricator instance.

Differential D143088

[CMake] Save and restore CMAKE_EXE_LINKER_FLAGS manually
ClosedPublic

Authored by phosek on Feb 1 2023, 9:32 AM.

Details

Reviewers
mstorsjo
Commits
rG9b94a67f8232: [CMake] Save and restore CMAKE_EXE_LINKER_FLAGS manually
Summary

cmake_push_check_state and cmake_pop_check_state doesn't save and
restore CMAKE_EXE_LINKER_FLAGS so we need to do it manually.

Diff Detail

Event Timeline

phosek created this revision.Feb 1 2023, 9:32 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 1 2023, 9:32 AM
phosek requested review of this revision.Feb 1 2023, 9:32 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 1 2023, 9:32 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
phosek mentioned this in D143052: [CMake] Replace llvm_check_linker_flag and llvm_check_compiler_linker_flag.Feb 1 2023, 9:38 AM
mstorsjo accepted this revision.Feb 1 2023, 9:51 AM

LGTM

This revision is now accepted and ready to land.Feb 1 2023, 9:51 AM
This revision was landed with ongoing or failed builds.Feb 1 2023, 10:05 AM
Closed by commit rG9b94a67f8232: [CMake] Save and restore CMAKE_EXE_LINKER_FLAGS manually (authored by phosek). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG9b94a67f8232: [CMake] Save and restore CMAKE_EXE_LINKER_FLAGS manually.
Harbormaster completed remote builds in B211260: Diff 493987.Feb 1 2023, 10:43 AM

Revision Contents

PathSize
llvm/
cmake/
modules/
5 lines

Diff 493998

llvm/cmake/modules/LLVMCheckLinkerFlag.cmake

include(CheckLinkerFlag OPTIONAL) include(CheckLinkerFlag OPTIONAL)
if (COMMAND check_linker_flag) if (COMMAND check_linker_flag)
macro(llvm_check_linker_flag) macro(llvm_check_linker_flag)
check_linker_flag(${ARGN}) check_linker_flag(${ARGN})
endmacro() endmacro()
else() else()
# Until the minimum CMAKE version is 3.18 # Until the minimum CMAKE version is 3.18
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(CMakePushCheckState)
# 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_linker_flag lang flag out_var) function(llvm_check_linker_flag lang flag out_var)
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(SET CMP0056 NEW) cmake_policy(SET CMP0056 NEW)
cmake_push_check_state() set(_CMAKE_EXE_LINKER_FLAGS_SAVE ${CMAKE_EXE_LINKER_FLAGS})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
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()
cmake_pop_check_state() set(CMAKE_EXE_LINKER_FLAGS ${_CMAKE_EXE_LINKER_FLAGS_SAVE})
cmake_policy(POP) cmake_policy(POP)
endfunction() endfunction()
endif() endif()