Skip to content

Commit 1df587e

Browse files
committed
[cmake] switch to CMake's native check_linker_flag, delete LLVMCheckLinkerFlag.cmake
now that CMake baseline has moved past 3.18; see https://cmake.org/cmake/help/latest/module/CheckLinkerFlag.html
1 parent 6859685 commit 1df587e

File tree

5 files changed

+11
-39
lines changed

5 files changed

+11
-39
lines changed

clang/tools/driver/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ endif()
107107

108108
if(CLANG_ORDER_FILE AND
109109
(LLVM_LINKER_IS_APPLE OR LLVM_LINKER_IS_GOLD OR LLVM_LINKER_IS_LLD))
110-
include(LLVMCheckLinkerFlag)
110+
include(CheckLinkerFlag)
111111

112112
if (LLVM_LINKER_IS_APPLE OR (LLVM_LINKER_IS_LLD AND APPLE))
113113
set(LINKER_ORDER_FILE_OPTION "-Wl,-order_file,${CLANG_ORDER_FILE}")
@@ -118,7 +118,7 @@ if(CLANG_ORDER_FILE AND
118118
endif()
119119

120120
# This is a test to ensure the actual order file works with the linker.
121-
llvm_check_linker_flag(CXX ${LINKER_ORDER_FILE_OPTION} LINKER_ORDER_FILE_WORKS)
121+
check_linker_flag(CXX ${LINKER_ORDER_FILE_OPTION} LINKER_ORDER_FILE_WORKS)
122122

123123
# Passing an empty order file disables some linker layout optimizations.
124124
# To work around this and enable workflows for re-linking when the order file

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ function(add_link_opts target_name)
327327
elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND LLVM_LINKER_IS_SOLARISLD)
328328
# Support for ld -z discard-unused=sections was only added in
329329
# Solaris 11.4. GNU ld ignores it, but warns every time.
330-
include(LLVMCheckLinkerFlag)
331-
llvm_check_linker_flag(CXX "-Wl,-z,discard-unused=sections" LINKER_SUPPORTS_Z_DISCARD_UNUSED)
330+
include(CheckLinkerFlag)
331+
check_linker_flag(CXX "-Wl,-z,discard-unused=sections" LINKER_SUPPORTS_Z_DISCARD_UNUSED)
332332
if (LINKER_SUPPORTS_Z_DISCARD_UNUSED)
333333
set_property(TARGET ${target_name} APPEND_STRING PROPERTY
334334
LINK_FLAGS " -Wl,-z,discard-unused=sections")

llvm/cmake/modules/HandleLLVMOptions.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,8 +1061,8 @@ if (LLVM_USE_SPLIT_DWARF AND
10611061
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
10621062
CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
10631063
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-gsplit-dwarf>)
1064-
include(LLVMCheckLinkerFlag)
1065-
llvm_check_linker_flag(CXX "-Wl,--gdb-index" LINKER_SUPPORTS_GDB_INDEX)
1064+
include(CheckLinkerFlag)
1065+
check_linker_flag(CXX "-Wl,--gdb-index" LINKER_SUPPORTS_GDB_INDEX)
10661066
append_if(LINKER_SUPPORTS_GDB_INDEX "-Wl,--gdb-index"
10671067
CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
10681068
endif()
@@ -1083,8 +1083,8 @@ endif()
10831083

10841084
# lld doesn't print colored diagnostics when invoked from Ninja
10851085
if (UNIX AND CMAKE_GENERATOR MATCHES "Ninja")
1086-
include(LLVMCheckLinkerFlag)
1087-
llvm_check_linker_flag(CXX "-Wl,--color-diagnostics" LINKER_SUPPORTS_COLOR_DIAGNOSTICS)
1086+
include(CheckLinkerFlag)
1087+
check_linker_flag(CXX "-Wl,--color-diagnostics" LINKER_SUPPORTS_COLOR_DIAGNOSTICS)
10881088
append_if(LINKER_SUPPORTS_COLOR_DIAGNOSTICS "-Wl,--color-diagnostics"
10891089
CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
10901090
endif()

llvm/cmake/modules/HandleLLVMStdlib.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED)
1313
endfunction()
1414

1515
include(CheckCXXCompilerFlag)
16-
include(LLVMCheckLinkerFlag)
16+
include(CheckLinkerFlag)
1717
set(LLVM_LIBCXX_USED 0)
1818
if(LLVM_ENABLE_LIBCXX)
1919
if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
2020
check_cxx_compiler_flag("-stdlib=libc++" CXX_COMPILER_SUPPORTS_STDLIB)
21-
llvm_check_linker_flag(CXX "-stdlib=libc++" CXX_LINKER_SUPPORTS_STDLIB)
21+
check_linker_flag(CXX "-stdlib=libc++" CXX_LINKER_SUPPORTS_STDLIB)
2222
if(CXX_COMPILER_SUPPORTS_STDLIB AND CXX_LINKER_SUPPORTS_STDLIB)
2323
append("-stdlib=libc++"
2424
CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS
@@ -36,7 +36,7 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED)
3636
if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
3737
check_cxx_compiler_flag("-static-libstdc++"
3838
CXX_COMPILER_SUPPORTS_STATIC_STDLIB)
39-
llvm_check_linker_flag(CXX "-static-libstdc++" CXX_LINKER_SUPPORTS_STATIC_STDLIB)
39+
check_linker_flag(CXX "-static-libstdc++" CXX_LINKER_SUPPORTS_STATIC_STDLIB)
4040
if(CXX_COMPILER_SUPPORTS_STATIC_STDLIB AND
4141
CXX_LINKER_SUPPORTS_STATIC_STDLIB)
4242
append("-static-libstdc++"

llvm/cmake/modules/LLVMCheckLinkerFlag.cmake

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)