llvm.org GIT mirror llvm / ce6e365
Revert "[runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/" This broke the windows bots. This reverts commit 28302c66d2586074f77497d5dc4eac7182b679e0. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355725 91177308-0d34-0410-b5e6-96231b3b80d8 Matthew Voss 6 months ago
1 changed file(s) with 4 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
123123 string(REPLACE "-" "_" canon_name ${projName})
124124 string(TOUPPER ${canon_name} canon_name)
125125
126 if(LLVM_RUNTIMES_LIBDIR_SUBDIR)
127 set(${canon_name}_LIBDIR_SUBDIR "${LLVM_RUNTIMES_LIBDIR_SUBDIR}" CACHE STRING "" FORCE)
126 if(LLVM_RUNTIMES_LIBDIR_SUFFIX)
127 set(${canon_name}_LIBDIR_SUFFIX "${LLVM_RUNTIMES_LIBDIR_SUFFIX}" CACHE STRING "" FORCE)
128128 endif()
129129
130130 # Setting a variable to let sub-projects detect which other projects
348348 # Builtins were built separately above
349349 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
350350 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
351 -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
352351 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
353352 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
354353 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
432431 # Builtins were built separately above
433432 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
434433 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
435 -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
436434 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
437435 -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
438436 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
515513 runtime_register_target(${name}-${sanitizer_name} ${name}
516514 DEPENDS runtimes-${name}
517515 CMAKE_ARGS -DLLVM_USE_SANITIZER=${sanitizer}
518 -DLLVM_RUNTIMES_LIBDIR_SUBDIR=${sanitizer_name})
516 -DLLVM_RUNTIMES_PREFIX=${name}/
517 -DLLVM_RUNTIMES_LIBDIR_SUFFIX=/${sanitizer_name})
519518 add_dependencies(runtimes runtimes-${name}-${sanitizer_name})
520519 add_dependencies(runtimes-configure runtimes-${name}-${sanitizer_name}-configure)
521520 add_dependencies(install-runtimes install-runtimes-${name}-${sanitizer_name})