tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake
2index 4059fc3e986c..e7b414d4c767 100644
3--- a/cmake/modules/AddClang.cmake
4+++ b/cmake/modules/AddClang.cmake
5@@ -134,8 +134,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)
16diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
17index 1b96ac417bf7..cf5b590fbc1b 100644
18--- a/lib/Headers/CMakeLists.txt
19+++ b/lib/Headers/CMakeLists.txt
20@@ -402,6 +402,7 @@ set(zos_wrapper_files
21
22 include(GetClangResourceDir)
23 get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)
24+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)
25 set(out_files)
26 set(generated_files)
27
28diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
29index b0105f5a5f79..c8298517b3d2 100644
30--- a/tools/libclang/CMakeLists.txt
31+++ b/tools/libclang/CMakeLists.txt
32@@ -244,7 +244,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})
33 COMPONENT
34 libclang-python-bindings
35 DESTINATION
36- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
37+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
38 endforeach()
39 if(NOT LLVM_ENABLE_IDE)
40 add_custom_target(libclang-python-bindings)
41diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt
42index 84087a9fd8d2..ecf377349cb5 100644
43--- a/tools/scan-build-py/CMakeLists.txt
44+++ b/tools/scan-build-py/CMakeLists.txt
45@@ -91,7 +91,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
46 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
47 list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
48 install(FILES lib/libscanbuild/${lib}
49- DESTINATION lib/libscanbuild
50+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"
51 COMPONENT scan-build-py)
52 endforeach()
53
54@@ -109,7 +109,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
55 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
56 list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
57 install(FILES lib/libscanbuild/resources/${resource}
58- DESTINATION lib/libscanbuild/resources
59+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"
60 COMPONENT scan-build-py)
61 endforeach()
62
63@@ -125,7 +125,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
64 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
65 list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
66 install(FILES lib/libear/${lib}
67- DESTINATION lib/libear
68+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"
69 COMPONENT scan-build-py)
70 endforeach()
71