tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 6 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 258 lines 10 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 2eee8e6148f7..63efc7d2fdd0 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@@ -365,7 +367,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@@ -374,7 +376,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@@ -382,7 +384,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 97ba3edea1c5..9d2bc5714af5 100644 76--- a/lib/Headers/CMakeLists.txt 77+++ b/lib/Headers/CMakeLists.txt 78@@ -142,13 +142,13 @@ 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 ${cuda_wrapper_files} 87 COMPONENT clang-headers 88 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 89- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 90+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 91 92 if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. 93 add_llvm_install_targets(install-clang-headers 94diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt 95index d38c7bb28709..c9b5499cb756 100644 96--- a/tools/c-index-test/CMakeLists.txt 97+++ b/tools/c-index-test/CMakeLists.txt 98@@ -50,7 +50,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 99 set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH 100 "@executable_path/../../lib") 101 else() 102- set(INSTALL_DESTINATION bin) 103+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) 104 endif() 105 106 install(TARGETS c-index-test 107diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt 108index c5ace26c2914..97bdfca7d896 100644 109--- a/tools/clang-check/CMakeLists.txt 110+++ b/tools/clang-check/CMakeLists.txt 111@@ -20,4 +20,4 @@ target_link_libraries(clang-check 112 ) 113 114 install(TARGETS clang-check 115- RUNTIME DESTINATION bin) 116+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 117diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 118index a295e8cd0b2a..1973ff82c7f6 100644 119--- a/tools/clang-format/CMakeLists.txt 120+++ b/tools/clang-format/CMakeLists.txt 121@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) 122 endif() 123 124 install(PROGRAMS clang-format-bbedit.applescript 125- DESTINATION share/clang 126+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 127 COMPONENT clang-format) 128 install(PROGRAMS clang-format-diff.py 129- DESTINATION share/clang 130+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 131 COMPONENT clang-format) 132 install(PROGRAMS clang-format-sublime.py 133- DESTINATION share/clang 134+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 135 COMPONENT clang-format) 136 install(PROGRAMS clang-format.el 137- DESTINATION share/clang 138+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 139 COMPONENT clang-format) 140 install(PROGRAMS clang-format.py 141- DESTINATION share/clang 142+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 143 COMPONENT clang-format) 144 install(PROGRAMS git-clang-format 145- DESTINATION bin 146+ DESTINATION ${CMAKE_INSTALL_BINDIR} 147 COMPONENT clang-format) 148diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt 149index ae28e28d532d..8ecb2e37a8f7 100644 150--- a/tools/clang-func-mapping/CMakeLists.txt 151+++ b/tools/clang-func-mapping/CMakeLists.txt 152@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping 153 ) 154 155 install(TARGETS clang-func-mapping 156- RUNTIME DESTINATION bin) 157+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 158diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt 159index 8718015be76a..7a038f39622e 100644 160--- a/tools/clang-offload-bundler/CMakeLists.txt 161+++ b/tools/clang-offload-bundler/CMakeLists.txt 162@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler 163 ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} 164 ) 165 166-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) 167+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 168diff --git a/tools/clang-refactor/CMakeLists.txt b/tools/clang-refactor/CMakeLists.txt 169index d2029066b9b7..9bc152a675af 100644 170--- a/tools/clang-refactor/CMakeLists.txt 171+++ b/tools/clang-refactor/CMakeLists.txt 172@@ -21,4 +21,4 @@ target_link_libraries(clang-refactor 173 clangToolingRefactor 174 ) 175 176-install(TARGETS clang-refactor RUNTIME DESTINATION bin) 177+install(TARGETS clang-refactor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 178diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt 179index 9689e1c6804d..6087716510a9 100644 180--- a/tools/clang-rename/CMakeLists.txt 181+++ b/tools/clang-rename/CMakeLists.txt 182@@ -16,8 +16,8 @@ target_link_libraries(clang-rename 183 ) 184 185 install(PROGRAMS clang-rename.py 186- DESTINATION share/clang 187+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 188 COMPONENT clang-rename) 189 install(PROGRAMS clang-rename.el 190- DESTINATION share/clang 191+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 192 COMPONENT clang-rename) 193diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt 194index 44406378207b..3b64b18ad4a5 100644 195--- a/tools/libclang/CMakeLists.txt 196+++ b/tools/libclang/CMakeLists.txt 197@@ -130,7 +130,7 @@ endif() 198 if(INTERNAL_INSTALL_PREFIX) 199 set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") 200 else() 201- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) 202+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 203 endif() 204 205 install(DIRECTORY ../../include/clang-c 206diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 207index 380379300b09..adfd58ed5f7d 100644 208--- a/tools/scan-build/CMakeLists.txt 209+++ b/tools/scan-build/CMakeLists.txt 210@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) 211 ${CMAKE_BINARY_DIR}/bin/ 212 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 213 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 214- install(PROGRAMS bin/${BinFile} DESTINATION bin) 215+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 216 endforeach() 217 218 foreach(LibexecFile ${LibexecFiles}) 219@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) 220 ${CMAKE_BINARY_DIR}/libexec/ 221 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 222 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 223- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) 224+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 225 endforeach() 226 227 foreach(ManPage ${ManPages}) 228@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) 229 ${CMAKE_BINARY_DIR}/share/scan-build/ 230 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 231 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 232- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) 233+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) 234 endforeach() 235 236 add_custom_target(scan-build ALL DEPENDS ${Depends}) 237diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 238index b305ca562a72..554bcb379061 100644 239--- a/tools/scan-view/CMakeLists.txt 240+++ b/tools/scan-view/CMakeLists.txt 241@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) 242 ${CMAKE_BINARY_DIR}/bin/ 243 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 244 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 245- install(PROGRAMS bin/${BinFile} DESTINATION bin) 246+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 247 endforeach() 248 249 foreach(ShareFile ${ShareFiles}) 250@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) 251 ${CMAKE_BINARY_DIR}/share/scan-view/ 252 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 253 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 254- install(FILES share/${ShareFile} DESTINATION share/scan-view) 255+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) 256 endforeach() 257 258 add_custom_target(scan-view ALL DEPENDS ${Depends})