diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-22 13:25:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-22 13:25:24 (GMT) |
| commit | 69355ff00c5a773f26c65caafbc9e77e76c824ff (patch) | |
| tree | e9e179049c2deb42359200a82ce2126822821420 | |
| parent | 69c6994023c05aefdbec15cacf2b4dae9e12622e (diff) | |
| parent | 5dd981539f6b81ad5697df974f309d9a6d4e78c6 (diff) | |
| download | CMake-69355ff00c5a773f26c65caafbc9e77e76c824ff.zip CMake-69355ff00c5a773f26c65caafbc9e77e76c824ff.tar.gz CMake-69355ff00c5a773f26c65caafbc9e77e76c824ff.tar.bz2 | |
Merge branch 'binutils-llvm-strip' into release-3.21
Merge-request: !6655
| -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 27d9131..8e9237a 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. |