Add LLVM 3.6 to all-packages

This commit is contained in:
Benjamin Saunders 2015-03-04 22:45:04 -08:00
parent f1b7e4d127
commit de89820f69

View file

@ -3197,6 +3197,7 @@ let
clang = wrapCC llvmPackages.clang; clang = wrapCC llvmPackages.clang;
clang_36 = wrapCC llvmPackages_36.clang;
clang_35 = wrapCC llvmPackages_35.clang; clang_35 = wrapCC llvmPackages_35.clang;
clang_34 = wrapCC llvmPackages_34.clang; clang_34 = wrapCC llvmPackages_34.clang;
clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
@ -3727,12 +3728,14 @@ let
llvm = llvmPackages.llvm; llvm = llvmPackages.llvm;
llvm_36 = llvmPackages_36.llvm;
llvm_35 = llvmPackages_35.llvm;
llvm_34 = llvmPackages_34.llvm; llvm_34 = llvmPackages_34.llvm;
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
llvm_v = path: callPackage path { }; llvm_v = path: callPackage path { };
llvmPackages = llvmPackages_35; llvmPackages = llvmPackages_36;
llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit stdenv newScope fetchurl; inherit stdenv newScope fetchurl;
@ -3744,6 +3747,10 @@ let
inherit pkgs stdenv newScope fetchurl isl; inherit pkgs stdenv newScope fetchurl isl;
}; };
llvmPackages_36 = import ../development/compilers/llvm/3.6 {
inherit pkgs stdenv newScope fetchurl isl;
};
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
mentorToolchains = recurseIntoAttrs ( mentorToolchains = recurseIntoAttrs (