diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-01-03 11:28:46 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-04 11:00:25 +0100 |
| commit | 23cf1985454db1e127c9418feee2d04a56ebe3ba (patch) | |
| tree | 68a1d296ca2c39cb2e20d9f871cec0952d3b83da /pkgs/development/compilers/llvm | |
| parent | 622a03c1981331b7fa55499040edfa6231a33ed9 (diff) | |
| download | nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar.gz nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar.bz2 nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar.lz nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar.xz nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.tar.zst nixlib-23cf1985454db1e127c9418feee2d04a56ebe3ba.zip | |
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.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -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 |