summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-09-18 14:19:58 -0500
committerWill Dietz <w@wdtz.org>2018-09-23 13:30:16 -0500
commitbb110d80fc7bbc06fd71bfa1122c016f14f43394 (patch)
tree106e1719b902762d00e7ca0d7c36640507e60ed2 /pkgs/top-level
parent7fb0194d4149a2592988de372cdfff2c2ee4e506 (diff)
downloadnixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar.gz
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar.bz2
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar.lz
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar.xz
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.tar.zst
nixlib-bb110d80fc7bbc06fd71bfa1122c016f14f43394.zip
llvm7: init at 7.0.0rc3
Copy of 6 + updated hashes
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ecd69cc0aa7..dacfc95d82ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6381,6 +6381,7 @@ with pkgs;
     };
   };
 
+  clang_7  = llvmPackages_7.clang;
   clang_6  = llvmPackages_6.clang;
   clang_5  = llvmPackages_5.clang;
   clang_4  = llvmPackages_4.clang;
@@ -6978,15 +6979,18 @@ with pkgs;
   lld_4 = llvmPackages_4.lld;
   lld_5 = llvmPackages_5.lld;
   lld_6 = llvmPackages_6.lld;
+  lld_7 = llvmPackages_7.lld;
 
   lldb = llvmPackages.lldb;
   lldb_4 = llvmPackages_4.lldb;
   lldb_5 = llvmPackages_5.lldb;
   lldb_6 = llvmPackages_6.lldb;
+  lldb_7 = llvmPackages_7.lldb;
 
   llvm = llvmPackages.llvm;
   llvm-manpages = llvmPackages.llvm-manpages;
 
+  llvm_7  = llvmPackages_7.llvm;
   llvm_6  = llvmPackages_6.llvm;
   llvm_5  = llvmPackages_5.llvm;
   llvm_4  = llvmPackages_4.llvm;
@@ -7051,6 +7055,14 @@ with pkgs;
     stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
+  llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({
+    inherit (stdenvAdapters) overrideCC;
+    buildLlvmTools = buildPackages.llvmPackages_7.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
+  } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  });
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (