[PATCH] D88310: [CMake][AIX] Limit tools in external project build

[David Tenty via Phabricator via llvm-commits]

daltenty created this revision.
daltenty added reviewers: hubert.reinterpretcast, jasonliu, Xiangling_L, DiggerLin.
Herald added subscribers: llvm-commits, mgorny.
Herald added a reviewer: alexshap.
Herald added a project: LLVM.
daltenty requested review of this revision.

This is a follow on to D85329 <https://reviews.llvm.org/D85329> which disabled some llvm tools in the
runtimes build due to XCOFF64 limitations. This change disables them
in other external project builds as well, when no list of tools is
specified in the arguments.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D88310

Files:
  llvm/cmake/modules/LLVMExternalProjectUtils.cmake


Index: llvm/cmake/modules/LLVMExternalProjectUtils.cmake
===================================================================
--- llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -53,14 +53,18 @@
   endforeach()
 
   if(NOT ARG_TOOLCHAIN_TOOLS)
-    set(ARG_TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objdump)
-    if(_cmake_system_name STREQUAL Darwin)
-      list(APPEND ARG_TOOLCHAIN_TOOLS llvm-libtool-darwin llvm-lipo)
-    elseif(_cmake_system_name STREQUAL Windows)
-      list(APPEND ARG_TOOLCHAIN_TOOLS llvm-lib)
-    else()
-      # TODO: These tools don't fully support Mach-O format yet.
-      list(APPEND ARG_TOOLCHAIN_TOOLS llvm-objcopy llvm-strip)
+    set(ARG_TOOLCHAIN_TOOLS clang)
+    # 64-bit XCOFF and big AR format is not yet supported in some of these tools.
+    if(NOT _cmake_system_name MATCHES AIX)
+      list(APPEND ARG_TOOLCHAIN_TOOLS lld llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objdump)
+      if(_cmake_system_name STREQUAL Darwin)
+        list(APPEND ARG_TOOLCHAIN_TOOLS llvm-libtool-darwin llvm-lipo)
+      elseif(_cmake_system_name STREQUAL Windows)
+        list(APPEND ARG_TOOLCHAIN_TOOLS llvm-lib)
+      else()
+        # TODO: These tools don't fully support Mach-O format yet.
+        list(APPEND ARG_TOOLCHAIN_TOOLS llvm-objcopy llvm-strip)
+      endif()
     endif()
   endif()
   foreach(tool ${ARG_TOOLCHAIN_TOOLS})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88310.294322.patch
Type: text/x-patch
Size: 1442 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200925/de1ad121/attachment.bin>