tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / development / compilers / llvm / git / libcxxabi / gnu-install-dirs.patch
at 23.05 22 lines 1.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index b8326d08d23a..a1e36f713161 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -187,7 +187,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH 6 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 7 set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) 8 set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) 9- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 10+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 11 "Path where built libc++abi libraries should be installed.") 12 if(LIBCXX_LIBDIR_SUBDIR) 13 string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) 14@@ -201,7 +201,7 @@ else() 15 set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) 16 set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) 17 endif() 18- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 19+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 20 "Path where built libc++abi libraries should be installed.") 21 endif() 22