top-level: add llvmPackages_9 and the usual variants

* Bump llvmPackages_latest to llvmPackages_9,
  since it's the latest ;)
* Leave llvmPackages = llvmPackages_7.... for now.
This commit is contained in:
Will Dietz 2019-09-19 13:38:45 -05:00
parent 99eeff0f69
commit 75b5ac394c
No known key found for this signature in database
GPG key ID: EBB0EA4124809D02

View file

@ -7412,6 +7412,7 @@ in
llvm-polly = llvmPackages_latest.llvm-polly;
clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
clang_9 = llvmPackages_9.clang;
clang_8 = llvmPackages_8.clang;
clang_7 = llvmPackages_7.clang;
clang_6 = llvmPackages_6.clang;
@ -8093,6 +8094,7 @@ in
lld_6 = llvmPackages_6.lld;
lld_7 = llvmPackages_7.lld;
lld_8 = llvmPackages_8.lld;
lld_9 = llvmPackages_9.lld;
lldb = llvmPackages.lldb;
lldb_4 = llvmPackages_4.lldb;
@ -8100,10 +8102,12 @@ in
lldb_6 = llvmPackages_6.lldb;
lldb_7 = llvmPackages_7.lldb;
lldb_8 = llvmPackages_8.lldb;
lldb_9 = llvmPackages_9.lldb;
llvm = llvmPackages.llvm;
llvm-manpages = llvmPackages.llvm-manpages;
llvm_9 = llvmPackages_9.llvm;
llvm_8 = llvmPackages_8.llvm;
llvm_7 = llvmPackages_7.llvm;
llvm_6 = llvmPackages_6.llvm;
@ -8170,7 +8174,15 @@ in
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
});
llvmPackages_latest = llvmPackages_8;
llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_9.tools;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
} // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
});
llvmPackages_latest = llvmPackages_9;
lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being.";