Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869diff --git a/CMakeLists.txt b/CMakeLists.txtindex d4e561b50d8f..cfa5bdd79c2a 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(LLD_BUILT_STANDALONE TRUE) + include(GNUInstallDirs)+ find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") if(NOT LLVM_CONFIG_PATH) message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")@@ -179,7 +181,7 @@ include_directories(BEFORE if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/- DESTINATION include+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h" )diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmakeindex 23df41312403..d62372c88de7 100644--- a/cmake/modules/AddLLD.cmake+++ b/cmake/modules/AddLLD.cmake@@ -20,9 +20,9 @@ macro(add_lld_library name) install(TARGETS ${name} COMPONENT ${name} ${export_to_lldtargets}- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}- RUNTIME DESTINATION bin)+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-${name}@@ -54,7 +54,7 @@ macro(add_lld_tool name) install(TARGETS ${name} ${export_to_lldtargets}- RUNTIME DESTINATION bin+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES)@@ -69,5 +69,5 @@ endmacro() macro(add_lld_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) endmacro()diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txtindex 5cff736ff57f..64e775c771b9 100644--- a/tools/lld/CMakeLists.txt+++ b/tools/lld/CMakeLists.txt@@ -21,7 +21,7 @@ target_link_libraries(lld ) install(TARGETS lld- RUNTIME DESTINATION bin)+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) if(NOT LLD_SYMLINKS_TO_CREATE) set(LLD_SYMLINKS_TO_CREATE