RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:43:36 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/"

Browse Source 
This broke the windows bots.

This reverts commit 28302c66d2586074f77497d5dc4eac7182b679e0.

llvm-svn: 355725
This commit is contained in:
Matthew Voss 2019-03-08 20:33:55 +00:00
parent 424fcc930d
commit f342eccf02
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtimes/CMakeLists.txt
View File

@ -124,8 +124,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
string(REPLACE "-" "_" canon_name ${projName}) string(REPLACE "-" "_" canon_name ${projName})
string(TOUPPER ${canon_name} canon_name) string(TOUPPER ${canon_name} canon_name)
if(LLVM_RUNTIMES_LIBDIR_SUBDIR) if(LLVM_RUNTIMES_LIBDIR_SUFFIX)
set(${canon_name}_LIBDIR_SUBDIR "${LLVM_RUNTIMES_LIBDIR_SUBDIR}" CACHE STRING "" FORCE) set(${canon_name}_LIBDIR_SUFFIX "${LLVM_RUNTIMES_LIBDIR_SUFFIX}" CACHE STRING "" FORCE)
endif() endif()
# Setting a variable to let sub-projects detect which other projects # Setting a variable to let sub-projects detect which other projects
@ -349,7 +349,6 @@ else() # if this is included from LLVM's CMake
# Builtins were built separately above # Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR} -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE} -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
@ -433,7 +432,6 @@ else() # if this is included from LLVM's CMake
# Builtins were built separately above # Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR} -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DLLVM_DEFAULT_TARGET_TRIPLE=${target} -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
@ -516,7 +514,8 @@ else() # if this is included from LLVM's CMake
runtime_register_target(${name}-${sanitizer_name} ${name} runtime_register_target(${name}-${sanitizer_name} ${name}
DEPENDS runtimes-${name} DEPENDS runtimes-${name}
CMAKE_ARGS -DLLVM_USE_SANITIZER=${sanitizer} CMAKE_ARGS -DLLVM_USE_SANITIZER=${sanitizer}
-DLLVM_RUNTIMES_LIBDIR_SUBDIR=${sanitizer_name}) -DLLVM_RUNTIMES_PREFIX=${name}/
-DLLVM_RUNTIMES_LIBDIR_SUFFIX=/${sanitizer_name})
add_dependencies(runtimes runtimes-${name}-${sanitizer_name}) add_dependencies(runtimes runtimes-${name}-${sanitizer_name})
add_dependencies(runtimes-configure runtimes-${name}-${sanitizer_name}-configure) add_dependencies(runtimes-configure runtimes-${name}-${sanitizer_name}-configure)
add_dependencies(install-runtimes install-runtimes-${name}-${sanitizer_name}) add_dependencies(install-runtimes install-runtimes-${name}-${sanitizer_name})