llvm.org GIT mirror llvm / bbf63cf
[runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/ This change is a consequence of the discussion in "RFC: Place libs in Clang-dedicated directories", specifically the suggestion that libunwind, libc++abi and libc++ shouldn't be using Clang resource directory. Tools like clangd make this assumption, but this is currently not true for the LLVM_ENABLE_PER_TARGET_RUNTIME_DIR build. This change addresses that by moving the output of these libraries to lib/<target> and include/ directories, leaving resource directory only for compiler-rt runtimes and Clang builtin headers. Differential Revision: https://reviews.llvm.org/D59013 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355665 91177308-0d34-0410-b5e6-96231b3b80d8 Petr Hosek 6 months ago
1 changed file(s) with 5 addition(s) and 4 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_SUFFIX)
127 set(${canon_name}_LIBDIR_SUFFIX "${LLVM_RUNTIMES_LIBDIR_SUFFIX}" CACHE STRING "" FORCE)
126 if(LLVM_RUNTIMES_LIBDIR_SUBDIR)
127 set(${canon_name}_LIBDIR_SUBDIR "${LLVM_RUNTIMES_LIBDIR_SUBDIR}" 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}
351352 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
352353 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
353354 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
431432 # Builtins were built separately above
432433 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
433434 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
435 -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
434436 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
435437 -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
436438 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
513515 runtime_register_target(${name}-${sanitizer_name} ${name}
514516 DEPENDS runtimes-${name}
515517 CMAKE_ARGS -DLLVM_USE_SANITIZER=${sanitizer}
516 -DLLVM_RUNTIMES_PREFIX=${name}/
517 -DLLVM_RUNTIMES_LIBDIR_SUFFIX=/${sanitizer_name})
518 -DLLVM_RUNTIMES_LIBDIR_SUBDIR=${sanitizer_name})
518519 add_dependencies(runtimes runtimes-${name}-${sanitizer_name})
519520 add_dependencies(runtimes-configure runtimes-${name}-${sanitizer_name}-configure)
520521 add_dependencies(install-runtimes install-runtimes-${name}-${sanitizer_name})