Browse Source

Merge topic 'binutils-llvm-ar-apple'

fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7077
Brad King 3 years ago
parent
commit
768d070180
1 changed files with 6 additions and 1 deletions
  1. 6 1
      Modules/CMakeFindBinUtils.cmake

+ 6 - 1
Modules/CMakeFindBinUtils.cmake

@@ -173,8 +173,13 @@ else()
     else()
       list(PREPEND _CMAKE_LINKER_NAMES "ld.lld")
     endif()
-    if(NOT APPLE)
+    if(APPLE)
       # llvm-ar does not generate a symbol table that the Apple ld64 linker accepts.
+      # FIXME(#23333): We still need to consider 'llvm-ar' as a fallback because
+      # the 'APPLE' definition may be based on the host in this context, and a
+      # cross-compiling toolchain may not have 'ar'.
+      list(APPEND _CMAKE_AR_NAMES "llvm-ar")
+    else()
       list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
     endif()
     list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib")