[PATCH] D88627: Revert "[AIX] Try to not use LLVM tools while building runtimes"

[Shoaib Meenai via Phabricator via llvm-commits]

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

https://reviews.llvm.org/D88310 fixed the issue in LLVMExternalProjectUtils,
so we shouldn't need the workaround in the runtimes build anymore. I'm
reverting it because it prevents the target-specific tool selection in
LLVMExternalProjectUtils from taking effect, which we rely on for our
runtimes builds.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D88627

Files:
  llvm/runtimes/CMakeLists.txt


Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -298,11 +298,6 @@
       endif()
     endforeach()
 
-    # 64-bit XCOFF and big AR format is not yet supported in some of these tools.
-    if(NOT target MATCHES aix)
-      set(${target}_toolchain_tools lld llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip)
-    endif()
-
     llvm_ExternalProject_Add(builtins-${target}
                              ${compiler_rt_path}/lib/builtins
                              DEPENDS ${ARG_DEPENDS}
@@ -316,7 +311,6 @@
                                         -DCMAKE_ASM_COMPILER_WORKS=ON
                                         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
                                         ${${target}_extra_args}
-                             TOOLCHAIN_TOOLS clang ${${target}_toolchain_tools}
                              USE_TOOLCHAIN
                              ${EXTRA_ARGS})
   endfunction()
@@ -524,11 +518,6 @@
       list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link)
     endif()
 
-    # 64-bit XCOFF and big AR format is not yet supported in some of these tools.
-    if(NOT target MATCHES aix)
-      set(${name}_toolchain_tools lld llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip)
-    endif()
-
     llvm_ExternalProject_Add(runtimes-${name}
                              ${CMAKE_CURRENT_SOURCE_DIR}
                              DEPENDS ${${name}_deps} ${CXX_HEADER_TARGET}
@@ -547,7 +536,6 @@
                                         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
                                         -DLLVM_RUNTIMES_TARGET=${name}
                                         ${${name}_extra_args}
-                             TOOLCHAIN_TOOLS clang ${${name}_toolchain_tools}
                              EXTRA_TARGETS ${${name}_extra_targets}
                                            ${${name}_test_targets}
                              USE_TOOLCHAIN


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88627.295449.patch
Type: text/x-patch
Size: 2099 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201001/2d7eb3e8/attachment.bin>