tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 10 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 248 lines 9.6 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index dc1413f4b597..c173531e624f 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -9,6 +9,8 @@ endif() 6 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) 7 project(Clang) 8 9+ include(GNUInstallDirs) 10+ 11 # Rely on llvm-config. 12 set(CONFIG_OUTPUT) 13 if(LLVM_CONFIG) 14@@ -417,7 +419,7 @@ include_directories(BEFORE 15 16 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 17 install(DIRECTORY include/clang include/clang-c 18- DESTINATION include 19+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 20 COMPONENT clang-headers 21 FILES_MATCHING 22 PATTERN "*.def" 23@@ -427,7 +429,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 24 ) 25 26 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang 27- DESTINATION include 28+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 29 COMPONENT clang-headers 30 FILES_MATCHING 31 PATTERN "CMakeFiles" EXCLUDE 32@@ -447,7 +449,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 33 34 add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) 35 install(PROGRAMS utils/bash-autocomplete.sh 36- DESTINATION share/clang 37+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 38 COMPONENT bash-autocomplete) 39 if(NOT LLVM_ENABLE_IDE) 40 add_llvm_install_targets(install-bash-autocomplete 41diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake 42index 577cc11ab015..a4f4481d8442 100644 43--- a/cmake/modules/AddClang.cmake 44+++ b/cmake/modules/AddClang.cmake 45@@ -114,9 +114,9 @@ macro(add_clang_library name) 46 install(TARGETS ${name} 47 COMPONENT ${name} 48 ${export_to_clangtargets} 49- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} 50- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} 51- RUNTIME DESTINATION bin) 52+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} 53+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} 54+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 55 56 if (NOT LLVM_ENABLE_IDE) 57 add_llvm_install_targets(install-${name} 58@@ -160,7 +160,7 @@ macro(add_clang_tool name) 59 60 install(TARGETS ${name} 61 ${export_to_clangtargets} 62- RUNTIME DESTINATION bin 63+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 64 COMPONENT ${name}) 65 66 if(NOT LLVM_ENABLE_IDE) 67@@ -175,7 +175,7 @@ endmacro() 68 macro(add_clang_symlink name dest) 69 add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) 70 # Always generate install targets 71- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) 72+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) 73 endmacro() 74 75 function(clang_target_link_libraries target type) 76diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt 77index 85c3124234ad..64c48235d914 100644 78--- a/lib/Headers/CMakeLists.txt 79+++ b/lib/Headers/CMakeLists.txt 80@@ -191,7 +191,7 @@ set_target_properties(clang-resource-headers PROPERTIES 81 FOLDER "Misc" 82 RUNTIME_OUTPUT_DIRECTORY "${output_dir}") 83 84-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 85+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 86 87 install( 88 FILES ${files} ${generated_files} 89diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt 90index ceef4b08637c..8efad5520ca4 100644 91--- a/tools/c-index-test/CMakeLists.txt 92+++ b/tools/c-index-test/CMakeLists.txt 93@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 94 set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH 95 "@executable_path/../../lib") 96 else() 97- set(INSTALL_DESTINATION bin) 98+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) 99 endif() 100 101 install(TARGETS c-index-test 102diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 103index 35ecdb11253c..d77d75de0094 100644 104--- a/tools/clang-format/CMakeLists.txt 105+++ b/tools/clang-format/CMakeLists.txt 106@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) 107 endif() 108 109 install(PROGRAMS clang-format-bbedit.applescript 110- DESTINATION share/clang 111+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 112 COMPONENT clang-format) 113 install(PROGRAMS clang-format-diff.py 114- DESTINATION share/clang 115+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 116 COMPONENT clang-format) 117 install(PROGRAMS clang-format-sublime.py 118- DESTINATION share/clang 119+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 120 COMPONENT clang-format) 121 install(PROGRAMS clang-format.el 122- DESTINATION share/clang 123+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 124 COMPONENT clang-format) 125 install(PROGRAMS clang-format.py 126- DESTINATION share/clang 127+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 128 COMPONENT clang-format) 129 install(PROGRAMS git-clang-format 130- DESTINATION bin 131+ DESTINATION ${CMAKE_INSTALL_BINDIR} 132 COMPONENT clang-format) 133diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt 134index cda8e29ec5b1..0134d8ccd70b 100644 135--- a/tools/clang-rename/CMakeLists.txt 136+++ b/tools/clang-rename/CMakeLists.txt 137@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename 138 ) 139 140 install(PROGRAMS clang-rename.py 141- DESTINATION share/clang 142+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 143 COMPONENT clang-rename) 144 install(PROGRAMS clang-rename.el 145- DESTINATION share/clang 146+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 147 COMPONENT clang-rename) 148diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt 149index a95444be40ee..136d96d9bf5b 100644 150--- a/tools/diagtool/CMakeLists.txt 151+++ b/tools/diagtool/CMakeLists.txt 152@@ -21,7 +21,7 @@ clang_target_link_libraries(diagtool 153 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 154 install(TARGETS diagtool 155 COMPONENT diagtool 156- RUNTIME DESTINATION bin) 157+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 158 159 if (NOT LLVM_ENABLE_IDE) 160 add_llvm_install_targets(install-diagtool 161diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt 162index 973655361f71..0181002e4e3b 100644 163--- a/tools/libclang/CMakeLists.txt 164+++ b/tools/libclang/CMakeLists.txt 165@@ -141,7 +141,7 @@ endif() 166 if(INTERNAL_INSTALL_PREFIX) 167 set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") 168 else() 169- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) 170+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 171 endif() 172 173 install(DIRECTORY ../../include/clang-c 174@@ -172,7 +172,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) 175 COMPONENT 176 libclang-python-bindings 177 DESTINATION 178- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 179+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 180 endforeach() 181 if(NOT LLVM_ENABLE_IDE) 182 add_custom_target(libclang-python-bindings) 183diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 184index 28241245fcb7..d6b59f02fc2a 100644 185--- a/tools/scan-build/CMakeLists.txt 186+++ b/tools/scan-build/CMakeLists.txt 187@@ -42,7 +42,7 @@ if(CLANG_INSTALL_SCANBUILD) 188 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 189 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 190 install(PROGRAMS bin/${BinFile} 191- DESTINATION bin 192+ DESTINATION ${CMAKE_INSTALL_BINDIR} 193 COMPONENT scan-build) 194 endforeach() 195 196@@ -56,7 +56,7 @@ if(CLANG_INSTALL_SCANBUILD) 197 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 198 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 199 install(PROGRAMS libexec/${LibexecFile} 200- DESTINATION libexec 201+ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} 202 COMPONENT scan-build) 203 endforeach() 204 205@@ -84,7 +84,7 @@ if(CLANG_INSTALL_SCANBUILD) 206 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 207 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 208 install(FILES share/scan-build/${ShareFile} 209- DESTINATION share/scan-build 210+ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build 211 COMPONENT scan-build) 212 endforeach() 213 214diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 215index 22edb974bac7..9f140a9a4538 100644 216--- a/tools/scan-view/CMakeLists.txt 217+++ b/tools/scan-view/CMakeLists.txt 218@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW) 219 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 220 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 221 install(PROGRAMS bin/${BinFile} 222- DESTINATION bin 223+ DESTINATION ${CMAKE_INSTALL_BINDIR} 224 COMPONENT scan-view) 225 endforeach() 226 227@@ -36,7 +36,7 @@ if(CLANG_INSTALL_SCANVIEW) 228 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 229 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 230 install(FILES share/${ShareFile} 231- DESTINATION share/scan-view 232+ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view 233 COMPONENT scan-view) 234 endforeach() 235 236diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt 237index 62f2de0cb15c..6aa66825b6ec 100644 238--- a/utils/hmaptool/CMakeLists.txt 239+++ b/utils/hmaptool/CMakeLists.txt 240@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM 241 242 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) 243 install(PROGRAMS ${CLANG_HMAPTOOL} 244- DESTINATION bin 245+ DESTINATION ${CMAKE_INSTALL_BINDIR} 246 COMPONENT hmaptool) 247 248 add_custom_target(hmaptool ALL DEPENDS ${Depends})