diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-07 14:20:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-07 14:21:22 (GMT) |
| commit | 6efc497ab48846beeaead4b2205bb54989b836e4 (patch) | |
| tree | a857aa8fdc9549ec6db16d669031067cfab8bc77 /Modules | |
| parent | 78c5c81d3566134a83afc845f5355a94a241120a (diff) | |
| parent | 053c2b3646eec44ec4d2d30f45a2c7d7b05e31ef (diff) | |
| download | CMake-6efc497ab48846beeaead4b2205bb54989b836e4.zip CMake-6efc497ab48846beeaead4b2205bb54989b836e4.tar.gz CMake-6efc497ab48846beeaead4b2205bb54989b836e4.tar.bz2 | |
Merge topic 'binutils-objcopy' into release-3.29
053c2b3646 BinUtils: Avoid llvm-objcopy versions older than Clang 9
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9219
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index cf270c0..5e85440 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -204,10 +204,10 @@ else() endif() list(PREPEND _CMAKE_NM_NAMES "llvm-nm") if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 9) - # llvm-objdump versions prior to 9 did not support everything we need. + # llvm-objcopy and llvm-objdump on versions prior to 9 did not support everything we need. + list(PREPEND _CMAKE_OBJCOPY_NAMES "llvm-objcopy") list(PREPEND _CMAKE_OBJDUMP_NAMES "llvm-objdump") endif() - list(PREPEND _CMAKE_OBJCOPY_NAMES "llvm-objcopy") list(PREPEND _CMAKE_READELF_NAMES "llvm-readelf") list(PREPEND _CMAKE_DLLTOOL_NAMES "llvm-dlltool") list(PREPEND _CMAKE_ADDR2LINE_NAMES "llvm-addr2line") |