tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / git / libunwind / gnu-install-dirs.patch
at 22.05 65 lines 3.1 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index e3cc66dd2226..1299b596ce0d 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -8,6 +8,8 @@ endif() 6 7 cmake_minimum_required(VERSION 3.13.4) 8 9+include(GNUInstallDirs) 10+ 11 set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") 12 13 # Add path for custom modules 14@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH 15 16 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 17 set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) 18- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 19+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH 20+ "Path where built libunwind headers should be installed.") 21+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 22 "Path where built libunwind libraries should be installed.") 23- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH 24+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH 25 "Path where built libunwind runtime libraries should be installed.") 26 if(LIBCXX_LIBDIR_SUBDIR) 27 string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) 28 string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) 29 endif() 30-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) 31- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) 32- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH 33- "Path where built libunwind libraries should be installed.") 34- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH 35- "Path where built libunwind runtime libraries should be installed.") 36 else() 37- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) 38- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH 39+ if(LLVM_LIBRARY_OUTPUT_INTDIR) 40+ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) 41+ else() 42+ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) 43+ endif() 44+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH 45+ "Path where built libunwind headers should be installed.") 46+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH 47 "Path where built libunwind libraries should be installed.") 48- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH 49+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH 50 "Path where built libunwind runtime libraries should be installed.") 51 endif() 52 53diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt 54index c3bb1dd0f69f..adf1766c44cb 100644 55--- a/include/CMakeLists.txt 56+++ b/include/CMakeLists.txt 57@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) 58 foreach(file ${files}) 59 get_filename_component(dir ${file} DIRECTORY) 60 install(FILES ${file} 61- DESTINATION "include/${dir}" 62+ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" 63 COMPONENT unwind-headers 64 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 65 )