diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-12-12 16:49:07 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-12-12 16:49:07 +0100 |
| commit | 6db6c6df7b29062f980150435cf357efee22d13b (patch) | |
| tree | 5a43b76c6fc54cdcff65444f200319a193728b2a /pkgs/development/compilers/llvm | |
| parent | 55ca7939944136731b34316a4c6fc2d4a11da122 (diff) | |
| download | nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar.gz nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar.bz2 nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar.lz nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar.xz nixlib-6db6c6df7b29062f980150435cf357efee22d13b.tar.zst nixlib-6db6c6df7b29062f980150435cf357efee22d13b.zip | |
llvmPackages_*: update name for LLVMgold patch for clang >= 11
It no longer applies to clang >= 16, let's make the name correspond to the versions it applies to.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/11/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/12/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/13/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/14/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/15/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch (renamed from pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index a4fe7199e080..0e61930f1c0e 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -50,7 +50,7 @@ let # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; + src = ../../clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 7ecd4efc0837..c46776d38ac3 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -47,7 +47,7 @@ let # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; + src = ../../clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index a070e64c7ddd..6604ae0efc3f 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -43,7 +43,7 @@ let ./revert-malloc-alignment-assumption.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; + src = ../../clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix index 976ff7580ac3..9f0da7a9f46c 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -46,7 +46,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; + src = ../../clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/15/clang/default.nix b/pkgs/development/compilers/llvm/15/clang/default.nix index 894db1a4975f..c49d6368cb97 100644 --- a/pkgs/development/compilers/llvm/15/clang/default.nix +++ b/pkgs/development/compilers/llvm/15/clang/default.nix @@ -52,7 +52,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; + src = ../../clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch b/pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch index 8f8991976f33..8f8991976f33 100644 --- a/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch +++ b/pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch |