tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 8 / libcxxabi / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 28 lines 1.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 92c7dc5dc557..556b3e05a042 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH 6 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) 7 project(libcxxabi CXX C) 8 9+ include(GNUInstallDirs) 10+ 11 set(PACKAGE_NAME libcxxabi) 12 set(PACKAGE_VERSION 8.0.0) 13 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") 14diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 15index 7e21fb2d7926..30711099a19c 100644 16--- a/src/CMakeLists.txt 17+++ b/src/CMakeLists.txt 18@@ -220,8 +220,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) 19 20 if (LIBCXXABI_INSTALL_LIBRARY) 21 install(TARGETS ${LIBCXXABI_INSTALL_TARGETS} 22- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi 23- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi 24+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi 25+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi 26 ) 27 endif() 28