tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index d4e561b50d8f..cfa5bdd79c2a 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
6 set(CMAKE_INCLUDE_CURRENT_DIR ON)
7 set(LLD_BUILT_STANDALONE TRUE)
8
9+ include(GNUInstallDirs)
10+
11 find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary")
12 if(NOT LLVM_CONFIG_PATH)
13 message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")
14@@ -179,7 +181,7 @@ include_directories(BEFORE
15
16 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
17 install(DIRECTORY include/
18- DESTINATION include
19+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
20 FILES_MATCHING
21 PATTERN "*.h"
22 )
23diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake
24index 23df41312403..d62372c88de7 100644
25--- a/cmake/modules/AddLLD.cmake
26+++ b/cmake/modules/AddLLD.cmake
27@@ -20,9 +20,9 @@ macro(add_lld_library name)
28 install(TARGETS ${name}
29 COMPONENT ${name}
30 ${export_to_lldtargets}
31- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
32- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
33- RUNTIME DESTINATION bin)
34+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
35+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
36+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
37
38 if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
39 add_llvm_install_targets(install-${name}
40@@ -54,7 +54,7 @@ macro(add_lld_tool name)
41
42 install(TARGETS ${name}
43 ${export_to_lldtargets}
44- RUNTIME DESTINATION bin
45+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
46 COMPONENT ${name})
47
48 if(NOT CMAKE_CONFIGURATION_TYPES)
49@@ -69,5 +69,5 @@ endmacro()
50 macro(add_lld_symlink name dest)
51 add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
52 # Always generate install targets
53- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)
54+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)
55 endmacro()
56diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt
57index 5cff736ff57f..64e775c771b9 100644
58--- a/tools/lld/CMakeLists.txt
59+++ b/tools/lld/CMakeLists.txt
60@@ -21,7 +21,7 @@ target_link_libraries(lld
61 )
62
63 install(TARGETS lld
64- RUNTIME DESTINATION bin)
65+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
66
67 if(NOT LLD_SYMLINKS_TO_CREATE)
68 set(LLD_SYMLINKS_TO_CREATE