From 9411766c352bd7096b9dc286d8763b8236645756 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 29 May 2021 08:07:28 -0400 Subject: BinUtils: Avoid llvm-objdump versions older than Clang 9 Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27) we correctly prefer the more-specific name `llvm-objdump` over `objdump` when using Clang. However, this breaks `file(GET_RUNTIME_DEPENDENCIES)` with `llvm-objdump` from Clang 8 and below. Avoid those older versions of `llvm-objdump`. --- Modules/CMakeFindBinUtils.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Modules/CMakeFindBinUtils.cmake') diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 9dac4a9b4e..ec6bc8d8ce 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") -- cgit v1.2.1