llvm.org GIT mirror llvm / 56f4680
[runtimes] Move libunwind, libc++abi and libc++ to lib/$target/c++ and include/c++ 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/c++ and include/c++ directories, leaving resource directory only for compiler-rt runtimes and Clang builtin headers. Differential Revision: https://reviews.llvm.org/D59168 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361432 91177308-0d34-0410-b5e6-96231b3b80d8 Petr Hosek 2 months ago
1 changed file(s) with 5 addition(s) and 3 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
357357 # Builtins were built separately above
358358 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
359359 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
360 -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
360361 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
361362 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
362363 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
447448 # Builtins were built separately above
448449 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
449450 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
451 -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
450452 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
451453 -DLLVM_DEFAULT_TARGET_TRIPLE=${target}
452454 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
518520 runtime_register_target(${name}+${multilib} ${name}
519521 DEPENDS runtimes-${name}
520522 CMAKE_ARGS -DLLVM_RUNTIMES_PREFIX=${name}/
521 -DLLVM_RUNTIMES_LIBDIR_SUFFIX=/${multilib})
523 -DLLVM_RUNTIMES_LIBDIR_SUBDIR=${multilib})
522524 add_dependencies(runtimes runtimes-${name}+${multilib})
523525 add_dependencies(runtimes-configure runtimes-${name}+${multilib}-configure)
524526 add_dependencies(install-runtimes install-runtimes-${name}+${multilib})