Browse Source

Merge topic 'binutils-clang-fallback-ld'

788b7afff2 FindBinUtils: Fall back to ld for Clang without lld

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6457
Brad King 4 years ago
parent
commit
76f1c9d598
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Modules/CMakeFindBinUtils.cmake

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