Skip to content

llvmPackages_{12,13,14,15,16,17,18,git}: use common libunwind #303447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wegank merged 1 commit into from
Apr 12, 2024
Merged

llvmPackages_{12,13,14,15,16,17,18,git}: use common libunwind #303447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkgs/development/compilers/llvm/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,12 @@ let
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
src = fetch "libunwind" "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb";
patches = [
./libunwind/gnu-install-dirs.patch
];
inherit llvm_meta;
inherit (buildLlvmTools) llvm;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

Expand Down
37 changes: 0 additions & 37 deletions pkgs/development/compilers/llvm/12/libunwind/default.nix
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pkgs/development/compilers/llvm/13/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ in let
monorepoSrc = src;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
patches = [
./libunwind/gnu-install-dirs.patch
];
inherit llvm_meta;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};
Expand Down
33 changes: 0 additions & 33 deletions pkgs/development/compilers/llvm/13/libunwind/default.nix
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pkgs/development/compilers/llvm/14/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,10 @@ in let
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
patches = [
./libunwind/gnu-install-dirs.patch
];
inherit llvm_meta;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};
Expand Down
47 changes: 0 additions & 47 deletions pkgs/development/compilers/llvm/14/libunwind/default.nix
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pkgs/development/compilers/llvm/15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,10 @@ in let
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
patches = [
./libunwind/gnu-install-dirs.patch
];
inherit llvm_meta;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};
Expand Down
67 changes: 0 additions & 67 deletions pkgs/development/compilers/llvm/15/libunwind/default.nix
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pkgs/development/compilers/llvm/16/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ in let
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
patches = [
./libunwind/gnu-install-dirs.patch
];
inherit llvm_meta;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};
Expand Down
67 changes: 0 additions & 67 deletions pkgs/development/compilers/llvm/16/libunwind/default.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/17/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ in let
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};

libunwind = callPackage ./libunwind {
libunwind = callPackage ../common/libunwind {
inherit llvm_meta;
stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
};
Expand Down
63 changes: 0 additions & 63 deletions pkgs/development/compilers/llvm/17/libunwind/default.nix
View file
Open in desktop

This file was deleted.

Loading