diff options
| author | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2020-08-10 21:35:49 -0400 |
|---|---|---|
| committer | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2020-08-10 21:35:49 -0400 |
| commit | 48cd6b8ca54edaa4682153874301df216747fc2d (patch) | |
| tree | 0da9c89724c9d42c6a63d2ba2fa213487af992fb /llvm/runtimes | |
| parent | ed66df6705a9dffc36fecc3468cc3ab430849182 (diff) | |
| download | llvm-48cd6b8ca54edaa4682153874301df216747fc2d.zip llvm-48cd6b8ca54edaa4682153874301df216747fc2d.tar.gz llvm-48cd6b8ca54edaa4682153874301df216747fc2d.tar.bz2 | |
Revert "[AIX] Try to not use LLVM tools while building runtimes"
This reverts commit 50dd75c8e0b81815c6da209d5a3dd7bf899d1262.
@phosek reports a build break.
Diffstat (limited to 'llvm/runtimes')
| -rw-r--r-- | llvm/runtimes/CMakeLists.txt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 8f5815e..dc74a46 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -274,11 +274,6 @@ else() # if this is included from LLVM's CMake 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} @@ -292,7 +287,7 @@ else() # if this is included from LLVM's CMake -DCMAKE_ASM_COMPILER_WORKS=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON ${${target}_extra_args} - TOOLCHAIN_TOOLS clang ${target}_toolchain_tools + TOOLCHAIN_TOOLS clang lld llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip USE_TOOLCHAIN ${EXTRA_ARGS}) endfunction() @@ -492,11 +487,6 @@ else() # if this is included from LLVM's CMake 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} @@ -515,7 +505,7 @@ else() # if this is included from LLVM's CMake -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON -DLLVM_RUNTIMES_TARGET=${name} ${${name}_extra_args} - TOOLCHAIN_TOOLS clang ${{name}_toolchain_tools} + TOOLCHAIN_TOOLS clang lld llvm-ar llvm-lipo llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip EXTRA_TARGETS ${${name}_extra_targets} ${${name}_test_targets} USE_TOOLCHAIN |