diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-26 13:07:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-26 13:07:30 (GMT) |
| commit | 814567faa3ae120dca72989ce5afe441cd8e4f9b (patch) | |
| tree | f6f3b9ae5ff5a32b547f013cf582d812a77b95c5 /Modules/CMakeFindBinUtils.cmake | |
| parent | b0c62a133e10c0706e0260ebc4094faa53fef616 (diff) | |
| parent | 5dd981539f6b81ad5697df974f309d9a6d4e78c6 (diff) | |
| download | CMake-814567faa3ae120dca72989ce5afe441cd8e4f9b.zip CMake-814567faa3ae120dca72989ce5afe441cd8e4f9b.tar.gz CMake-814567faa3ae120dca72989ce5afe441cd8e4f9b.tar.bz2 | |
Merge topic 'binutils-llvm-strip' into release-3.22
5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6655
Diffstat (limited to 'Modules/CMakeFindBinUtils.cmake')
| -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 05d244a..6033ef6 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -174,7 +174,10 @@ else() endif() list(PREPEND _CMAKE_AR_NAMES "llvm-ar") list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib") - list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip") + if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 11) + # llvm-strip versions prior to 11 require additional flags we do not yet add. + list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip") + 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. |