diff options
| author | paperchalice <lgamma@163.com> | 2023-06-02 23:29:44 -0700 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-06-03 04:21:35 -0700 |
| commit | 0beffb854209a41f31beb18f9631258349a99299 (patch) | |
| tree | a2476605cbbdaae0b3f28ac6b46214c9b2578ae2 /clang/runtime | |
| parent | 4c2ec08ebc62e70c872eb58f6adde77ed52c4cc9 (diff) | |
| download | llvm-0beffb854209a41f31beb18f9631258349a99299.zip llvm-0beffb854209a41f31beb18f9631258349a99299.tar.gz llvm-0beffb854209a41f31beb18f9631258349a99299.tar.bz2 | |
[CMake] Ensure `CLANG_RESOURCE_DIR` is respected.
re-commit of 39aa0f5c434b463520ac39a8dbe933ee8c4c5ea7 with missing file:
cmake/Modules/GetClangResourceDir.cmake.
Diffstat (limited to 'clang/runtime')
| -rw-r--r-- | clang/runtime/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index 94b5d78..2dd3054 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -66,6 +66,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) list(APPEND compiler_rt_configure_deps LLVMTestingSupport) endif() + include(GetClangResourceDir) + get_clang_resource_dir(output_resource_dir PREFIX ${LLVM_BINARY_DIR}) + get_clang_resource_dir(install_resource_dir) ExternalProject_Add(compiler-rt DEPENDS llvm-config clang ${compiler_rt_configure_deps} PREFIX ${COMPILER_RT_PREFIX} @@ -82,9 +85,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} - -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION_MAJOR} + -DCOMPILER_RT_OUTPUT_DIR=${output_resource_dir} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} - -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR} + -DCOMPILER_RT_INSTALL_PATH:PATH=${install_resource_dir} -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} |