From d371649f7f773c29a93be526cbc7da8c84b708ff Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 3 Jan 2024 11:28:46 +0100 Subject: llvmPackages_{16,17,git}.lldb: tell cc-wrapper about libclang*.so It appears that LLVM's build system no longer sets the executable's rpath to include the faux resource root we pass in, so we need to make sure cc-wrapper does this. (cherry picked from commit 3c049266e7ae0110e49d9cd7a618b0dc82f9845e) --- pkgs/development/compilers/llvm/common/lldb.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 2444c1795a78..3ab71a8d3e9d 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -69,6 +69,11 @@ stdenv.mkDerivation (rec { libedit libxml2 libllvm + ] ++ lib.optionals (lib.versionAtLeast release_version "16") [ + # Starting with LLVM 16, the resource dir patch is no longer enough to get + # libclang into the rpath of the lldb executables. By putting it into + # buildInputs cc-wrapper will set up rpath correctly for us. + (lib.getLib libclang) ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc -- cgit v1.2.3