diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-01 12:34:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-01 12:35:04 (GMT) |
| commit | 54cc20137cb5ea304a298dc63e68c86ebe6a2b89 (patch) | |
| tree | 101388d092c64d89ba702fad5558cdae80cd3da0 | |
| parent | 76d583accd300e6463f225bd1f3556993078ad0e (diff) | |
| parent | 9411766c352bd7096b9dc286d8763b8236645756 (diff) | |
| download | CMake-54cc20137cb5ea304a298dc63e68c86ebe6a2b89.zip CMake-54cc20137cb5ea304a298dc63e68c86ebe6a2b89.tar.gz CMake-54cc20137cb5ea304a298dc63e68c86ebe6a2b89.tar.bz2 | |
Merge topic 'binutils-consistency'
9411766c35 BinUtils: Avoid llvm-objdump versions older than Clang 9
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6175
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 9dac4a9..ec6bc8d 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -126,7 +126,10 @@ else() list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib") list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip") list(PREPEND _CMAKE_NM_NAMES "llvm-nm") - list(PREPEND _CMAKE_OBJDUMP_NAMES "llvm-objdump") + if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 9) + # llvm-objdump versions prior to 9 did not support everything we need. + 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") |