OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[runtimes] Remove TOOLCHAIN_TOOLS specialization 

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.

Reviewed By: daltenty

Differential Revision: https://reviews.llvm.org/D88627
This commit is contained in:
Shoaib Meenai 2020-09-30 18:00:18 -07:00
parent c6ea095b97
commit dcb5b6dfbf
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/runtimes/CMakeLists.txt
View File

@ -298,11 +298,6 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
endif() endif()
endforeach() 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} llvm_ExternalProject_Add(builtins-${target}
${compiler_rt_path}/lib/builtins ${compiler_rt_path}/lib/builtins
DEPENDS ${ARG_DEPENDS} DEPENDS ${ARG_DEPENDS}
@ -316,7 +311,6 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
${${target}_extra_args} ${${target}_extra_args}
TOOLCHAIN_TOOLS clang ${${target}_toolchain_tools}
USE_TOOLCHAIN USE_TOOLCHAIN
${EXTRA_ARGS}) ${EXTRA_ARGS})
endfunction() endfunction()
@ -524,11 +518,6 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link) list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link)
endif() 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} llvm_ExternalProject_Add(runtimes-${name}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${${name}_deps} ${CXX_HEADER_TARGET} DEPENDS ${${name}_deps} ${CXX_HEADER_TARGET}
@ -547,7 +536,6 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-DLLVM_RUNTIMES_TARGET=${name} -DLLVM_RUNTIMES_TARGET=${name}
${${name}_extra_args} ${${name}_extra_args}
TOOLCHAIN_TOOLS clang ${${name}_toolchain_tools}
EXTRA_TARGETS ${${name}_extra_targets} EXTRA_TARGETS ${${name}_extra_targets}
${${name}_test_targets} ${${name}_test_targets}
USE_TOOLCHAIN USE_TOOLCHAIN