Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmakeindex 75b0080f6715..c895b884cd27 100644--- a/cmake/modules/AddClang.cmake+++ b/cmake/modules/AddClang.cmake@@ -119,8 +119,8 @@ macro(add_clang_library name) install(TARGETS ${lib} COMPONENT ${lib} ${export_to_clangtargets}- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") if (NOT LLVM_ENABLE_IDE)diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txtindex f2b0c5cddcbb..52f37fc368ce 100644--- a/lib/Headers/CMakeLists.txt+++ b/lib/Headers/CMakeLists.txt@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files}) add_header_target("utility-resource-headers" ${utility_files}) get_clang_resource_dir(header_install_dir SUBDIR include)+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) ############################################################# # Install rules for the catch-all clang-resource-headers targetdiff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txtindex 4f23065a2472..6a0f55991e24 100644--- a/tools/libclang/CMakeLists.txt+++ b/tools/libclang/CMakeLists.txt@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") endforeach() if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings)diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txtindex 3aca22c0b0a8..3115353e3fe3 100644--- a/tools/scan-build-py/CMakeLists.txt+++ b/tools/scan-build-py/CMakeLists.txt@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) install(FILES lib/libscanbuild/${lib}- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" COMPONENT scan-build-py) endforeach() @@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) install(FILES lib/libscanbuild/resources/${resource}- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" COMPONENT scan-build-py) endforeach() @@ -122,7 +122,7 @@ foreach(lib ${LibEar}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) install(FILES lib/libear/${lib}- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" COMPONENT scan-build-py) endforeach()