summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-04 13:51:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-04 13:52:06 (GMT)
commit4c68c59117ee59d763602c3f8f6858e937cee4c2 (patch)
tree87bdc20caf1124b6a50fe1fc26cac9a11f250f68
parent54502555795c98daf0f5afc2b2e980bd4036f39e (diff)
parent29ea94e17c61b485f5cd1036e0ba8282b44ebb0e (diff)
downloadCMake-4c68c59117ee59d763602c3f8f6858e937cee4c2.zip
CMake-4c68c59117ee59d763602c3f8f6858e937cee4c2.tar.gz
CMake-4c68c59117ee59d763602c3f8f6858e937cee4c2.tar.bz2
Merge topic 'binutils-llvm-ar-clang-macos'
29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7039
-rw-r--r--Modules/CMakeFindBinUtils.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 6c81754..6dbe626 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -172,7 +172,10 @@ else()
else()
list(PREPEND _CMAKE_LINKER_NAMES "ld.lld")
endif()
- list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
+ if(NOT APPLE)
+ # llvm-ar does not generate a symbol table that the Apple ld64 linker accepts.
+ list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
+ endif()
list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib")
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.