diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97ef392bce27..57873c619d72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7895,6 +7895,7 @@ in llvm-polly = llvmPackages_latest.llvm-polly; clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; }; + clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; clang_8 = llvmPackages_8.clang; clang_7 = llvmPackages_7.clang; @@ -8589,6 +8590,7 @@ in lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; + lld_10 = llvmPackages_10.lld; lldb = llvmPackages.lldb; lldb_5 = llvmPackages_5.lldb; @@ -8596,10 +8598,12 @@ in lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; + lldb_10 = llvmPackages_10.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; llvm_8 = llvmPackages_8.llvm; llvm_7 = llvmPackages_7.llvm; @@ -8650,7 +8654,15 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_latest = llvmPackages_9; + llvmPackages_10 = callPackage ../development/compilers/llvm/10 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_10.tools; + targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + }); + + llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; |