diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-19 14:25:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-19 14:26:17 (GMT) |
| commit | daeb4f0f5070d70e0bae9e966099f64b4c4671e9 (patch) | |
| tree | 15e86632b6c2db3baaf266ccf953f5c80b2a52bb /Modules | |
| parent | a7daf30070755cb4cac5ce50f80217adb29e6063 (diff) | |
| parent | 788b7afff20a59bada4dbb21418d9f83290996c6 (diff) | |
| download | CMake-daeb4f0f5070d70e0bae9e966099f64b4c4671e9.zip CMake-daeb4f0f5070d70e0bae9e966099f64b4c4671e9.tar.gz CMake-daeb4f0f5070d70e0bae9e966099f64b4c4671e9.tar.bz2 | |
Merge topic 'binutils-clang-fallback-ld' into release-3.21
788b7afff2 FindBinUtils: Fall back to ld for Clang without lld
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6457
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index d0beac6..bb97f4a 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -165,9 +165,9 @@ else() # Prepend toolchain-specific names. if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL Clang) if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC") - set(_CMAKE_LINKER_NAMES "lld-link") + list(PREPEND _CMAKE_LINKER_NAMES "lld-link") else() - set(_CMAKE_LINKER_NAMES "ld.lld") + list(PREPEND _CMAKE_LINKER_NAMES "ld.lld") endif() list(PREPEND _CMAKE_AR_NAMES "llvm-ar") list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib") |