diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-01-03 11:28:46 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-04 13:42:24 +0100 |
| commit | d371649f7f773c29a93be526cbc7da8c84b708ff (patch) | |
| tree | 236d37430765bd5f8cd6335b133b598d9e357e7c | |
| parent | llvmPackages_{14,15,16,17,git}.lldb: unify lua and python path patch (diff) | |
| download | nixpkgs-d371649f7f773c29a93be526cbc7da8c84b708ff.tar.gz | |
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)
| -rw-r--r-- | pkgs/development/compilers/llvm/common/lldb.nix | 5 |
1 files changed, 5 insertions, 0 deletions
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 |