From 622a03c1981331b7fa55499040edfa6231a33ed9 Mon Sep 17 00:00:00 2001 From: Semion Nadezhdin Date: Mon, 28 Aug 2023 11:28:40 +0500 Subject: llvmPackages_{14,15,16,17,git}.lldb: unify lua and python path patch --- pkgs/development/compilers/llvm/git/default.nix | 2 +- .../compilers/llvm/git/lldb/gnu-install-dirs.patch | 23 ---------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch (limited to 'pkgs/development/compilers/llvm/git') diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 337809e85e63..41ce6076da5f 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -158,7 +158,7 @@ in let patches = [ # FIXME: do we need this? ./procfs.patch - ./lldb/gnu-install-dirs.patch + ../common/lldb/gnu-install-dirs.patch ] # This is a stopgap solution if/until the macOS SDK used for x86_64 is # updated. diff --git a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch deleted file mode 100644 index 4388f5c7f593..000000000000 --- a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 3291a7c808e1..b27d27ce6a87 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -109,7 +109,7 @@ function(add_lldb_library name) - endif() - - if(PARAM_SHARED) -- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(PARAM_INSTALL_PREFIX) - set(install_dest ${PARAM_INSTALL_PREFIX}) - endif() -diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index 7d48491ec89a..c04543585588 100644 ---- a/tools/intel-features/CMakeLists.txt -+++ b/tools/intel-features/CMakeLists.txt -@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED - ) - - install(TARGETS lldbIntelFeatures -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) -- cgit 1.4.1