]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | clang/lib/Headers/CMakeLists.txt | 2 +- |
2 | clang/runtime/CMakeLists.txt | 2 +- | |
3 | compiler-rt/cmake/base-config-ix.cmake | 2 +- | |
4 | 3 files changed, 3 insertions(+), 3 deletions(-) | |
5 | ||
6 | diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt | |
7 | index 0692fe75a441..65f72c2da7da 100644 | |
8 | --- a/clang/lib/Headers/CMakeLists.txt | |
9 | +++ b/clang/lib/Headers/CMakeLists.txt | |
10 | @@ -208,7 +208,7 @@ set_target_properties(clang-resource-headers PROPERTIES | |
11 | FOLDER "Misc" | |
12 | RUNTIME_OUTPUT_DIRECTORY "${output_dir}") | |
13 | ||
14 | -set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) | |
15 | +set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) | |
16 | ||
17 | install( | |
18 | FILES ${files} ${generated_files} | |
19 | diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt | |
20 | index 61bbbf8faedd..f6d0b73d9913 100644 | |
21 | --- a/clang/runtime/CMakeLists.txt | |
22 | +++ b/clang/runtime/CMakeLists.txt | |
23 | @@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) | |
24 | -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} | |
25 | -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} | |
26 | -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} | |
27 | - -DCOMPILER_RT_INSTALL_PATH:STRING=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} | |
28 | + -DCOMPILER_RT_INSTALL_PATH:STRING=tools/llvm/lib/clang/${CLANG_VERSION} | |
29 | -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} | |
30 | -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} | |
31 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} | |
32 | diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake | |
33 | index 964dd598f102..7379a1ba06d1 100644 | |
34 | --- a/compiler-rt/cmake/base-config-ix.cmake | |
35 | +++ b/compiler-rt/cmake/base-config-ix.cmake | |
36 | @@ -43,7 +43,7 @@ if (LLVM_TREE_AVAILABLE) | |
37 | # Setup the paths where compiler-rt runtimes and headers should be stored. | |
38 | set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) | |
39 | set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) | |
40 | - set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) | |
41 | + set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION}) | |
42 | option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." | |
43 | ${LLVM_INCLUDE_TESTS}) | |
44 | option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" |