tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 8 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 290 lines 12 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index c2016a45ca6b..9224797da0b5 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@@ -382,7 +384,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 FILES_MATCHING 21 PATTERN "*.def" 22 PATTERN "*.h" 23@@ -391,7 +393,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 FILES_MATCHING 30 PATTERN "CMakeFiles" EXCLUDE 31 PATTERN "*.inc" 32@@ -399,7 +401,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 33 ) 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 7e22f16f365b..3c0c1d245969 100644 43--- a/cmake/modules/AddClang.cmake 44+++ b/cmake/modules/AddClang.cmake 45@@ -99,9 +99,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 (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) 57 add_llvm_install_targets(install-${name} 58@@ -142,7 +142,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 CMAKE_CONFIGURATION_TYPES) 67@@ -157,5 +157,5 @@ 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() 74diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt 75index e444c9c8706f..f8e4d06366a4 100644 76--- a/lib/Headers/CMakeLists.txt 77+++ b/lib/Headers/CMakeLists.txt 78@@ -164,19 +164,19 @@ install( 79 FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h 80 COMPONENT clang-headers 81 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 82- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 83+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 84 85 install( 86 FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h 87 COMPONENT clang-headers 88 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 89- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 90+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 91 92 install( 93 FILES ${cuda_wrapper_files} 94 COMPONENT clang-headers 95 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 96- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 97+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 98 99 if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. 100 add_llvm_install_targets(install-clang-headers 101diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt 102index 53e3421f1b35..79ae5bb4c399 100644 103--- a/tools/c-index-test/CMakeLists.txt 104+++ b/tools/c-index-test/CMakeLists.txt 105@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 106 set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH 107 "@executable_path/../../lib") 108 else() 109- set(INSTALL_DESTINATION bin) 110+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) 111 endif() 112 113 install(TARGETS c-index-test 114diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt 115index b837b0a0a5d9..9e30bd5780a5 100644 116--- a/tools/clang-check/CMakeLists.txt 117+++ b/tools/clang-check/CMakeLists.txt 118@@ -21,4 +21,4 @@ target_link_libraries(clang-check 119 ) 120 121 install(TARGETS clang-check 122- RUNTIME DESTINATION bin) 123+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 124diff --git a/tools/clang-extdef-mapping/CMakeLists.txt b/tools/clang-extdef-mapping/CMakeLists.txt 125index 6c81689a831a..dacc14737719 100644 126--- a/tools/clang-extdef-mapping/CMakeLists.txt 127+++ b/tools/clang-extdef-mapping/CMakeLists.txt 128@@ -18,4 +18,4 @@ target_link_libraries(clang-extdef-mapping 129 ) 130 131 install(TARGETS clang-extdef-mapping 132- RUNTIME DESTINATION bin) 133+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 134diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 135index a295e8cd0b2a..1973ff82c7f6 100644 136--- a/tools/clang-format/CMakeLists.txt 137+++ b/tools/clang-format/CMakeLists.txt 138@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) 139 endif() 140 141 install(PROGRAMS clang-format-bbedit.applescript 142- DESTINATION share/clang 143+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 144 COMPONENT clang-format) 145 install(PROGRAMS clang-format-diff.py 146- DESTINATION share/clang 147+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 148 COMPONENT clang-format) 149 install(PROGRAMS clang-format-sublime.py 150- DESTINATION share/clang 151+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 152 COMPONENT clang-format) 153 install(PROGRAMS clang-format.el 154- DESTINATION share/clang 155+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 156 COMPONENT clang-format) 157 install(PROGRAMS clang-format.py 158- DESTINATION share/clang 159+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 160 COMPONENT clang-format) 161 install(PROGRAMS git-clang-format 162- DESTINATION bin 163+ DESTINATION ${CMAKE_INSTALL_BINDIR} 164 COMPONENT clang-format) 165diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt 166index 8718015be76a..7a038f39622e 100644 167--- a/tools/clang-offload-bundler/CMakeLists.txt 168+++ b/tools/clang-offload-bundler/CMakeLists.txt 169@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler 170 ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} 171 ) 172 173-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) 174+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 175diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt 176index 45cbd763425c..f534e022024a 100644 177--- a/tools/clang-rename/CMakeLists.txt 178+++ b/tools/clang-rename/CMakeLists.txt 179@@ -19,8 +19,8 @@ target_link_libraries(clang-rename 180 ) 181 182 install(PROGRAMS clang-rename.py 183- DESTINATION share/clang 184+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 185 COMPONENT clang-rename) 186 install(PROGRAMS clang-rename.el 187- DESTINATION share/clang 188+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 189 COMPONENT clang-rename) 190diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt 191index 96d1c390249c..41c762b37b76 100644 192--- a/tools/diagtool/CMakeLists.txt 193+++ b/tools/diagtool/CMakeLists.txt 194@@ -21,7 +21,7 @@ target_link_libraries(diagtool 195 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 196 install(TARGETS diagtool 197 COMPONENT diagtool 198- RUNTIME DESTINATION bin) 199+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 200 201 if (NOT CMAKE_CONFIGURATION_TYPES) 202 add_llvm_install_targets(install-diagtool 203diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt 204index 32333b011ad1..258dfb2d520c 100644 205--- a/tools/libclang/CMakeLists.txt 206+++ b/tools/libclang/CMakeLists.txt 207@@ -131,7 +131,7 @@ endif() 208 if(INTERNAL_INSTALL_PREFIX) 209 set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") 210 else() 211- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) 212+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 213 endif() 214 215 install(DIRECTORY ../../include/clang-c 216@@ -162,7 +162,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) 217 COMPONENT 218 libclang-python-bindings 219 DESTINATION 220- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 221+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") 222 endforeach() 223 if(NOT CMAKE_CONFIGURATION_TYPES) 224 add_custom_target(libclang-python-bindings) 225diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 226index 380379300b09..adfd58ed5f7d 100644 227--- a/tools/scan-build/CMakeLists.txt 228+++ b/tools/scan-build/CMakeLists.txt 229@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) 230 ${CMAKE_BINARY_DIR}/bin/ 231 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 232 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 233- install(PROGRAMS bin/${BinFile} DESTINATION bin) 234+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 235 endforeach() 236 237 foreach(LibexecFile ${LibexecFiles}) 238@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) 239 ${CMAKE_BINARY_DIR}/libexec/ 240 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 241 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 242- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) 243+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 244 endforeach() 245 246 foreach(ManPage ${ManPages}) 247@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) 248 ${CMAKE_BINARY_DIR}/share/scan-build/ 249 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 250 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 251- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) 252+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) 253 endforeach() 254 255 add_custom_target(scan-build ALL DEPENDS ${Depends}) 256diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 257index b305ca562a72..554bcb379061 100644 258--- a/tools/scan-view/CMakeLists.txt 259+++ b/tools/scan-view/CMakeLists.txt 260@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) 261 ${CMAKE_BINARY_DIR}/bin/ 262 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 263 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 264- install(PROGRAMS bin/${BinFile} DESTINATION bin) 265+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 266 endforeach() 267 268 foreach(ShareFile ${ShareFiles}) 269@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) 270 ${CMAKE_BINARY_DIR}/share/scan-view/ 271 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 272 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 273- install(FILES share/${ShareFile} DESTINATION share/scan-view) 274+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) 275 endforeach() 276 277 add_custom_target(scan-view ALL DEPENDS ${Depends}) 278diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt 279index 5573009d343a..24b3a90f233f 100644 280--- a/utils/hmaptool/CMakeLists.txt 281+++ b/utils/hmaptool/CMakeLists.txt 282@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM 283 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) 284 285 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) 286-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) 287+install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) 288 289 add_custom_target(hmaptool ALL DEPENDS ${Depends}) 290 set_target_properties(hmaptool PROPERTIES FOLDER "Utils")