[PATCH] D74107: [CMake] Use llvm-ar etal for external project build on Darwin

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added reviewers: ldionne, beanz, smeenai.
Herald added subscribers: llvm-commits, dexonsmith, mgorny.
Herald added a project: LLVM.

This is needed for the runtimes build since libc++ and libc++abi
archive merging relies on ar to extract files out of the archive,
even on Darwin.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D74107

Files:
  llvm/cmake/modules/LLVMExternalProjectUtils.cmake


Index: llvm/cmake/modules/LLVMExternalProjectUtils.cmake
===================================================================
--- llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -47,8 +47,10 @@
   canonicalize_tool_name(${name} nameCanon)
   if(NOT ARG_TOOLCHAIN_TOOLS)
     set(ARG_TOOLCHAIN_TOOLS clang lld)
-    if(NOT APPLE AND NOT WIN32)
+    if(NOT APPLE AND NOT MSVC)
       list(APPEND ARG_TOOLCHAIN_TOOLS llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip)
+    elseif(APPLE)
+      list(APPEND ARG_TOOLCHAIN_TOOLS llvm-ar llvm-lipo llvm-ranlib)
     endif()
   endif()
   foreach(tool ${ARG_TOOLCHAIN_TOOLS})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74107.242803.patch
Type: text/x-patch
Size: 701 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200206/db3027a3/attachment.bin>