tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / development / compilers / llvm / 17 / compiler-rt / gnu-install-dirs.patch
at devShellTools-shell 1.2 kB view raw
1diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake 2index 8a6219568b3f..30ee68a47ccf 100644 3--- a/cmake/base-config-ix.cmake 4+++ b/cmake/base-config-ix.cmake 5@@ -100,13 +100,13 @@ endif() 6 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 7 set(COMPILER_RT_OUTPUT_LIBRARY_DIR 8 ${COMPILER_RT_OUTPUT_DIR}/lib) 9- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) 10+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") 11 set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH 12 "Path where built compiler-rt libraries should be installed.") 13 else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 14 set(COMPILER_RT_OUTPUT_LIBRARY_DIR 15 ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) 16- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") 17+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") 18 set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH 19 "Path where built compiler-rt libraries should be installed.") 20 endif()