Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-30 17:21:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 50dd75c8e0.
@phosek reports a build break.
This commit is contained in:
Hubert Tong 2020-08-10 21:35:49 -04:00
parent ed66df6705
commit 48cd6b8ca5
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/runtimes/CMakeLists.txt
View File

@ -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