Merge pull request #34457 from dtzWill/feature/llvm-6

llvm 6: init
This commit is contained in:
Will Dietz
2018-03-08 12:38:31 -06:00
committed by GitHub
14 changed files with 813 additions and 1 deletions
+9
View File
@@ -5780,6 +5780,7 @@ with pkgs;
};
};
clang_6 = llvmPackages_6.clang;
clang_5 = llvmPackages_5.clang;
clang_4 = llvmPackages_4.clang;
clang_39 = llvmPackages_39.clang;
@@ -6465,13 +6466,16 @@ with pkgs;
lld = llvmPackages.lld;
lld_4 = llvmPackages_4.lld;
lld_5 = llvmPackages_5.lld;
lld_6 = llvmPackages_6.lld;
lldb = llvmPackages.lldb;
lldb_4 = llvmPackages_4.lldb;
lldb_5 = llvmPackages_5.lldb;
lldb_6 = llvmPackages_6.lldb;
llvm = llvmPackages.llvm;
llvm_6 = llvmPackages_6.llvm;
llvm_5 = llvmPackages_5.llvm;
llvm_4 = llvmPackages_4.llvm;
llvm_39 = llvmPackages_39.llvm;
@@ -6535,6 +6539,9 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
inherit (stdenvAdapters) overrideCC;
};
manticore = callPackage ../development/compilers/manticore { };
mentorToolchains = recurseIntoAttrs (
@@ -20897,6 +20904,8 @@ with pkgs;
cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; };
cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
stdenv-inputs = callPackage ../test/stdenv-inputs { };
cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
+5 -1
View File
@@ -119,7 +119,11 @@ let
jobs.tests.cc-wrapper-clang-5.x86_64-linux
jobs.tests.cc-wrapper-clang-5.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
jobs.tests.cc-wrapper-libcxx-5.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.cc-wrapper-clang-6.x86_64-linux
jobs.tests.cc-wrapper-clang-6.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.cc-multilib-gcc.x86_64-linux
jobs.tests.cc-multilib-clang.x86_64-linux
jobs.tests.stdenv-inputs.x86_64-linux