tjh.dev
1diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake
2index 9bbbfc032b7d..947bd0da865d 100644
3--- a/cmake/modules/AddClang.cmake
4+++ b/cmake/modules/AddClang.cmake
5@@ -119,8 +119,8 @@ macro(add_clang_library name)
6 install(TARGETS ${lib}
7 COMPONENT ${lib}
8 ${export_to_clangtargets}
9- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
10- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
11+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
12+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
13 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
14
15 if (NOT LLVM_ENABLE_IDE)
16@@ -175,7 +175,7 @@ endmacro()
17 macro(add_clang_symlink name dest)
18 add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
19 # Always generate install targets
20- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)
21+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)
22 endmacro()
23
24 function(clang_target_link_libraries target type)
25diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
26index 078988980c52..14b58614b40a 100644
27--- a/lib/Headers/CMakeLists.txt
28+++ b/lib/Headers/CMakeLists.txt
29@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES
30 FOLDER "Misc"
31 RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
32
33-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
34+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
35
36 install(
37 FILES ${files} ${generated_files}
38diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
39index 4e0647971ab4..68dd67fcc476 100644
40--- a/tools/libclang/CMakeLists.txt
41+++ b/tools/libclang/CMakeLists.txt
42@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})
43 COMPONENT
44 libclang-python-bindings
45 DESTINATION
46- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
47+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
48 endforeach()
49 if(NOT LLVM_ENABLE_IDE)
50 add_custom_target(libclang-python-bindings)