Merge pull request #136562 from primeos/llvm-backport
[21.05] Backport LLVM 13
This commit is contained in:
@@ -11325,6 +11325,7 @@ in
|
||||
lld_10 = llvmPackages_10.lld;
|
||||
lld_11 = llvmPackages_11.lld;
|
||||
lld_12 = llvmPackages_12.lld;
|
||||
lld_13 = llvmPackages_13.lld;
|
||||
|
||||
lldb = llvmPackages_latest.lldb;
|
||||
lldb_5 = llvmPackages_5.lldb;
|
||||
@@ -11335,11 +11336,13 @@ in
|
||||
lldb_10 = llvmPackages_10.lldb;
|
||||
lldb_11 = llvmPackages_11.lldb;
|
||||
lldb_12 = llvmPackages_12.lldb;
|
||||
lldb_13 = llvmPackages_13.lldb;
|
||||
|
||||
llvm = llvmPackages.llvm;
|
||||
libllvm = llvmPackages.libllvm;
|
||||
llvm-manpages = llvmPackages.llvm-manpages;
|
||||
|
||||
llvm_13 = llvmPackages_13.llvm;
|
||||
llvm_12 = llvmPackages_12.llvm;
|
||||
llvm_11 = llvmPackages_11.llvm;
|
||||
llvm_10 = llvmPackages_10.llvm;
|
||||
@@ -11418,6 +11421,14 @@ in
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_13.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_latest = llvmPackages_11;
|
||||
|
||||
llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });
|
||||
|
||||
Reference in New Issue
Block a user