tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 9 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 278 lines 11 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 60937aa9db38..45522ff32998 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@@ -413,7 +415,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@@ -423,7 +425,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@@ -442,7 +444,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 33 endif() 34 35 install(PROGRAMS utils/bash-autocomplete.sh 36- DESTINATION share/clang 37+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 38 ) 39 endif() 40 41diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake 42index cbd618e18afb..63ba43f18e64 100644 43--- a/cmake/modules/AddClang.cmake 44+++ b/cmake/modules/AddClang.cmake 45@@ -109,9 +109,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@@ -155,7 +155,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@@ -170,7 +170,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 a3c0b08fa364..aa4215c0999c 100644 78--- a/lib/Headers/CMakeLists.txt 79+++ b/lib/Headers/CMakeLists.txt 80@@ -185,7 +185,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-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt 103index 4576d78bcfb4..7c3b302d8d59 100644 104--- a/tools/clang-check/CMakeLists.txt 105+++ b/tools/clang-check/CMakeLists.txt 106@@ -21,4 +21,4 @@ clang_target_link_libraries(clang-check 107 ) 108 109 install(TARGETS clang-check 110- RUNTIME DESTINATION bin) 111+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 112diff --git a/tools/clang-extdef-mapping/CMakeLists.txt b/tools/clang-extdef-mapping/CMakeLists.txt 113index 4798bdb71ad0..02d07b9982ac 100644 114--- a/tools/clang-extdef-mapping/CMakeLists.txt 115+++ b/tools/clang-extdef-mapping/CMakeLists.txt 116@@ -18,4 +18,4 @@ clang_target_link_libraries(clang-extdef-mapping 117 ) 118 119 install(TARGETS clang-extdef-mapping 120- RUNTIME DESTINATION bin) 121+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 122diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 123index 35ecdb11253c..d77d75de0094 100644 124--- a/tools/clang-format/CMakeLists.txt 125+++ b/tools/clang-format/CMakeLists.txt 126@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) 127 endif() 128 129 install(PROGRAMS clang-format-bbedit.applescript 130- DESTINATION share/clang 131+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 132 COMPONENT clang-format) 133 install(PROGRAMS clang-format-diff.py 134- DESTINATION share/clang 135+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 136 COMPONENT clang-format) 137 install(PROGRAMS clang-format-sublime.py 138- DESTINATION share/clang 139+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 140 COMPONENT clang-format) 141 install(PROGRAMS clang-format.el 142- DESTINATION share/clang 143+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 144 COMPONENT clang-format) 145 install(PROGRAMS clang-format.py 146- DESTINATION share/clang 147+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 148 COMPONENT clang-format) 149 install(PROGRAMS git-clang-format 150- DESTINATION bin 151+ DESTINATION ${CMAKE_INSTALL_BINDIR} 152 COMPONENT clang-format) 153diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt 154index 465bef040a6c..729369ed9429 100644 155--- a/tools/clang-offload-bundler/CMakeLists.txt 156+++ b/tools/clang-offload-bundler/CMakeLists.txt 157@@ -22,4 +22,4 @@ clang_target_link_libraries(clang-offload-bundler 158 ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} 159 ) 160 161-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) 162+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 163diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt 164index cda8e29ec5b1..0134d8ccd70b 100644 165--- a/tools/clang-rename/CMakeLists.txt 166+++ b/tools/clang-rename/CMakeLists.txt 167@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename 168 ) 169 170 install(PROGRAMS clang-rename.py 171- DESTINATION share/clang 172+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 173 COMPONENT clang-rename) 174 install(PROGRAMS clang-rename.el 175- DESTINATION share/clang 176+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 177 COMPONENT clang-rename) 178diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt 179index a95444be40ee..136d96d9bf5b 100644 180--- a/tools/diagtool/CMakeLists.txt 181+++ b/tools/diagtool/CMakeLists.txt 182@@ -21,7 +21,7 @@ clang_target_link_libraries(diagtool 183 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 184 install(TARGETS diagtool 185 COMPONENT diagtool 186- RUNTIME DESTINATION bin) 187+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 188 189 if (NOT LLVM_ENABLE_IDE) 190 add_llvm_install_targets(install-diagtool 191diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt 192index 613ead1a36b6..e5c7bf27f739 100644 193--- a/tools/libclang/CMakeLists.txt 194+++ b/tools/libclang/CMakeLists.txt 195@@ -137,7 +137,7 @@ endif() 196 if(INTERNAL_INSTALL_PREFIX) 197 set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") 198 else() 199- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) 200+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 201 endif() 202 203 install(DIRECTORY ../../include/clang-c 204@@ -168,7 +168,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) 205 COMPONENT 206 libclang-python-bindings 207 DESTINATION 208- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 209+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 210 endforeach() 211 if(NOT LLVM_ENABLE_IDE) 212 add_custom_target(libclang-python-bindings) 213diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 214index 380379300b09..adfd58ed5f7d 100644 215--- a/tools/scan-build/CMakeLists.txt 216+++ b/tools/scan-build/CMakeLists.txt 217@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) 218 ${CMAKE_BINARY_DIR}/bin/ 219 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 220 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 221- install(PROGRAMS bin/${BinFile} DESTINATION bin) 222+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 223 endforeach() 224 225 foreach(LibexecFile ${LibexecFiles}) 226@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) 227 ${CMAKE_BINARY_DIR}/libexec/ 228 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 229 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 230- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) 231+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 232 endforeach() 233 234 foreach(ManPage ${ManPages}) 235@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) 236 ${CMAKE_BINARY_DIR}/share/scan-build/ 237 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 238 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 239- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) 240+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) 241 endforeach() 242 243 add_custom_target(scan-build ALL DEPENDS ${Depends}) 244diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 245index b305ca562a72..554bcb379061 100644 246--- a/tools/scan-view/CMakeLists.txt 247+++ b/tools/scan-view/CMakeLists.txt 248@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) 249 ${CMAKE_BINARY_DIR}/bin/ 250 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 251 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 252- install(PROGRAMS bin/${BinFile} DESTINATION bin) 253+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 254 endforeach() 255 256 foreach(ShareFile ${ShareFiles}) 257@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) 258 ${CMAKE_BINARY_DIR}/share/scan-view/ 259 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 260 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 261- install(FILES share/${ShareFile} DESTINATION share/scan-view) 262+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) 263 endforeach() 264 265 add_custom_target(scan-view ALL DEPENDS ${Depends}) 266diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt 267index 5573009d343a..24b3a90f233f 100644 268--- a/utils/hmaptool/CMakeLists.txt 269+++ b/utils/hmaptool/CMakeLists.txt 270@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM 271 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) 272 273 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) 274-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) 275+install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) 276 277 add_custom_target(hmaptool ALL DEPENDS ${Depends}) 278 set_target_properties(hmaptool PROPERTIES FOLDER "Utils")