mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 07:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'binutils-llvm-ar-apple' into release-3.23

Browse Source 
fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7077
This commit is contained in:
Brad King
2022-03-16 15:09:38 +00:00
committed by Kitware Robot
parent 790c225208 fee36b7a78
commit 1925a5ccc2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/CMakeFindBinUtils.cmake
View File

@@ -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")