RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-04 00:31:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Adding support for overriding LLVM_ENABLE_RUNTIMES for runtimes builds."

Browse Source 
This reverts commit r371566: this doesn't correctly handle the case
where LLVM_ENABLE_RUNTIMES contains a list of values.

llvm-svn: 371579
This commit is contained in:
Petr Hosek 2019-09-11 00:43:35 +00:00
parent 2fa52a1992
commit ada598f6b5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtimes/CMakeLists.txt
View File

@ -460,10 +460,6 @@ else() # if this is included from LLVM's CMake
endif() endif()
endforeach() endforeach()
if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES})
endif()
if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS) if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)
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()
@ -486,6 +482,7 @@ else() # if this is included from LLVM's CMake
-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}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip
EXTRA_TARGETS ${${name}_extra_targets} EXTRA_TARGETS ${${name}_extra_targets}
${${name}_test_targets} ${${name}_test_targets}