colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_{12,13,14,15,16,17,18,git}: use fixpoint instead of rec 

Currently, overriding llvmPackages.libllvm doesn’t work correctly. The
original version of libllvm will also be built because it is referenced
by libclang. Switching to the fixpoint allows the override to be
propagated to clang as expected. This will be needed for future Darwin
stdenv bootstrap improvements.
This commit is contained in:
Randy Eckenrode 2024-04-21 20:44:23 -04:00
parent 6718453294
commit 99df680e03
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/12/default.nix
View File

@ -56,7 +56,7 @@ let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -74,7 +74,7 @@ let
./clang/gnu-install-dirs.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit clang-tools-extra_src llvm_meta;

4
pkgs/development/compilers/llvm/13/default.nix
View File

@ -82,7 +82,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -105,7 +105,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/14/default.nix
View File

@ -78,7 +78,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -96,7 +96,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/15/default.nix
View File

@ -84,7 +84,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -102,7 +102,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/16/default.nix
View File

@ -85,7 +85,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -103,7 +103,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/17/default.nix
View File

@ -80,7 +80,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -98,7 +98,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/18/default.nix
View File

@ -80,7 +80,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -98,7 +98,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/git/default.nix
View File

@ -85,7 +85,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -103,7 +103,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;