tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 7 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 281 lines 12 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 52b881939499..85662a2113e7 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) 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 find_program(LLVM_CONFIG "llvm-config") 14@@ -374,7 +376,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@@ -383,7 +385,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@@ -391,7 +393,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 c09a8423f9f6..39f37e0097eb 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@@ -141,7 +141,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@@ -156,5 +156,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 1930d8e225c7..bb9158093079 100644 76--- a/lib/Headers/CMakeLists.txt 77+++ b/lib/Headers/CMakeLists.txt 78@@ -162,19 +162,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 c5ace26c2914..97bdfca7d896 100644 116--- a/tools/clang-check/CMakeLists.txt 117+++ b/tools/clang-check/CMakeLists.txt 118@@ -20,4 +20,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-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 125index a295e8cd0b2a..1973ff82c7f6 100644 126--- a/tools/clang-format/CMakeLists.txt 127+++ b/tools/clang-format/CMakeLists.txt 128@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) 129 endif() 130 131 install(PROGRAMS clang-format-bbedit.applescript 132- DESTINATION share/clang 133+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 134 COMPONENT clang-format) 135 install(PROGRAMS clang-format-diff.py 136- DESTINATION share/clang 137+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 138 COMPONENT clang-format) 139 install(PROGRAMS clang-format-sublime.py 140- DESTINATION share/clang 141+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 142 COMPONENT clang-format) 143 install(PROGRAMS clang-format.el 144- DESTINATION share/clang 145+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 146 COMPONENT clang-format) 147 install(PROGRAMS clang-format.py 148- DESTINATION share/clang 149+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 150 COMPONENT clang-format) 151 install(PROGRAMS git-clang-format 152- DESTINATION bin 153+ DESTINATION ${CMAKE_INSTALL_BINDIR} 154 COMPONENT clang-format) 155diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt 156index ae28e28d532d..8ecb2e37a8f7 100644 157--- a/tools/clang-func-mapping/CMakeLists.txt 158+++ b/tools/clang-func-mapping/CMakeLists.txt 159@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping 160 ) 161 162 install(TARGETS clang-func-mapping 163- RUNTIME DESTINATION bin) 164+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 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 3b3ab1540a80..9aca9ba4a2cf 100644 177--- a/tools/clang-rename/CMakeLists.txt 178+++ b/tools/clang-rename/CMakeLists.txt 179@@ -18,8 +18,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 e539c8308e75..4e1fbccea35d 100644 205--- a/tools/libclang/CMakeLists.txt 206+++ b/tools/libclang/CMakeLists.txt 207@@ -130,7 +130,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 216diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 217index 380379300b09..adfd58ed5f7d 100644 218--- a/tools/scan-build/CMakeLists.txt 219+++ b/tools/scan-build/CMakeLists.txt 220@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) 221 ${CMAKE_BINARY_DIR}/bin/ 222 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 223 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 224- install(PROGRAMS bin/${BinFile} DESTINATION bin) 225+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 226 endforeach() 227 228 foreach(LibexecFile ${LibexecFiles}) 229@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) 230 ${CMAKE_BINARY_DIR}/libexec/ 231 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 232 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 233- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) 234+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 235 endforeach() 236 237 foreach(ManPage ${ManPages}) 238@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) 239 ${CMAKE_BINARY_DIR}/share/scan-build/ 240 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 241 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 242- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) 243+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) 244 endforeach() 245 246 add_custom_target(scan-build ALL DEPENDS ${Depends}) 247diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 248index b305ca562a72..554bcb379061 100644 249--- a/tools/scan-view/CMakeLists.txt 250+++ b/tools/scan-view/CMakeLists.txt 251@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) 252 ${CMAKE_BINARY_DIR}/bin/ 253 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 254 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 255- install(PROGRAMS bin/${BinFile} DESTINATION bin) 256+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 257 endforeach() 258 259 foreach(ShareFile ${ShareFiles}) 260@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) 261 ${CMAKE_BINARY_DIR}/share/scan-view/ 262 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 263 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 264- install(FILES share/${ShareFile} DESTINATION share/scan-view) 265+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) 266 endforeach() 267 268 add_custom_target(scan-view ALL DEPENDS ${Depends}) 269diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt 270index 5573009d343a..24b3a90f233f 100644 271--- a/utils/hmaptool/CMakeLists.txt 272+++ b/utils/hmaptool/CMakeLists.txt 273@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM 274 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) 275 276 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) 277-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) 278+install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) 279 280 add_custom_target(hmaptool ALL DEPENDS ${Depends}) 281 set_target_properties(hmaptool PROPERTIES FOLDER "Utils")