Browse Source

Merge topic 'binutils-objcopy' into release-3.29

053c2b3646 BinUtils: Avoid llvm-objcopy versions older than Clang 9

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9219
Brad King 1 year ago
parent
commit
6efc497ab4
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Modules/CMakeFindBinUtils.cmake

+ 2 - 2
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")