[runtimes] Remove TOOLCHAIN_TOOLS specialization

[smeenai]

Summary

https://reviews.llvm.org/D88310 fixed the AIX 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.

[hubert.reinterpretcast]

This sounds right. @daltenty, can you confirm that this works on the AIX builds?

[daltenty]

This actually isn't exclusively a revert of D85329 "[AIX] Try to not use LLVM tools while building runtimes" as the title seems to suggest. Before that patch there were already explicit TOOLCHAIN_TOOLS specified in the call to llvm_ExternalProject_Add in the runtimes build, which already suppressed the target-specific tool selection as mention in the description here.

That said, I'm not opposed to the resulting change, which moves all that logic to one place rather than having an extra layer on top just for the runtimes build. We should clarify the title and description though, because removing the TOOLCHAIN_TOOLS here entirely will actually be a new change to how runtimes are built.

[smeenai]

In D88627#2306231, @daltenty wrote:

This actually isn't exclusively a revert of D85329 "[AIX] Try to not use LLVM tools while building runtimes" as the title seems to suggest. Before that patch there were already explicit TOOLCHAIN_TOOLS specified in the call to llvm_ExternalProject_Add in the runtimes build, which already suppressed the target-specific tool selection as mention in the description here.

That said, I'm not opposed to the resulting change, which moves all that logic to one place rather than having an extra layer on top just for the runtimes build. We should clarify the title and description though, because removing the TOOLCHAIN_TOOLS here entirely will actually be a new change to how runtimes are built.

Ah, I see what happened here. You'd made your commit initially and then it was reverted. In the meantime, I committed D86366 to remove TOOLCHAIN_TOOLS entirely from the runtimes build, and then your commit was rebased on top of that and reapplied as rGe03dd978d015, which does add the TOOLCHAIN_TOOLS back. I'll clarify the description.

[daltenty]

LGTM! Thanks for the clarification.

llvm/runtimes/CMakeLists.txt

foreach(variableName ${variableNames})
       string(FIND "${variableName}" "BUILTINS_${target}" out)
       if("${out}" EQUAL 0)
         string(REPLACE "BUILTINS_${target}_" "" new_name ${variableName})
         string(REPLACE ";" "|" new_value "${${variableName}}")
         list(APPEND ${target}_extra_args "-D${new_name}=${new_value}")
       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}
                              CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
                                         -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
                                         -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
                                         -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
                                         -DCMAKE_C_COMPILER_TARGET=${target}
                                         -DCMAKE_ASM_COMPILER_TARGET=${target}
                                         -DCMAKE_C_COMPILER_WORKS=ON
                                         -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()
 
   # If compiler-rt is present we need to build the builtin libraries first. This
   # is required because the other runtimes need the builtin libraries present
   # before the just-built compiler can pass the configuration tests.
   get_compiler_rt_path(compiler_rt_path)
if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES AND NOT RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES)
       string(REPLACE ";" "|" LLVM_ENABLE_RUNTIMES_PASSTHROUGH "${LLVM_ENABLE_RUNTIMES}")
       list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES_PASSTHROUGH})
     endif()
 
     if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)
       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}
                              # Builtins were built separately above
                              CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
                                         -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
                                         -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
                                         -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                         -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
                                         -DCMAKE_C_COMPILER_TARGET=${target}
                                         -DCMAKE_CXX_COMPILER_TARGET=${target}
                                         -DCMAKE_ASM_COMPILER_TARGET=${target}
                                         -DCMAKE_C_COMPILER_WORKS=ON
                                         -DCMAKE_CXX_COMPILER_WORKS=ON
                                         -DCMAKE_ASM_COMPILER_WORKS=ON
                                         -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
                              ${EXTRA_ARGS})
   endfunction()
 
   if(runtimes)
     # Create a runtimes target that uses this file as its top-level CMake file.