llvm: Separate tools and libraries for clarity

Especially provides clarity with respect to cross.

pkgs/development/compilers/llvm/3.7/default.nix

@@ -1,12 +1,10 @@
 { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
 , overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; });
-
   version = "3.7.1";
 
   fetch = fetch_v version;
@@ -18,41 +16,44 @@ let
   compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
   clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+  in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools

pkgs/development/compilers/llvm/3.8/default.nix

@@ -1,11 +1,9 @@
 { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
-
   version = "3.8.1";
 
   fetch = fetch_v version;
@@ -17,43 +15,46 @@ let
   compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
   clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+ in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    libclang = self.clang-unwrapped.lib;
+    libclang = tools.clang-unwrapped.lib;
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools

pkgs/development/compilers/llvm/3.9/default.nix

@@ -1,11 +1,9 @@
 { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
-
   version = "3.9.1";
 
   fetch = fetch_v version;
@@ -17,43 +15,46 @@ let
   compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
   clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+  in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    libclang = self.clang-unwrapped.lib;
+    libclang = tools.clang-unwrapped.lib;
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools

pkgs/development/compilers/llvm/4/default.nix

@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "4.0.1";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
+  tools = let
-    inherit compiler-rt_src stdenv;
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-  };
+  in {
 
-  clang-unwrapped = callPackage ./clang {
+    llvm = overrideManOutput (callPackage ./llvm.nix {
-    inherit clang-tools-extra_src stdenv;
+      inherit compiler-rt_src;
-  };
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
+    libclang = tools.clang-unwrapped.lib;
-    llvm = overrideManOutput llvm;
+    llvm-manpages = lowPrio tools.llvm.man;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools

pkgs/development/compilers/llvm/5/default.nix

@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "5.0.1";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
+  tools = let
-    inherit compiler-rt_src stdenv;
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-  };
+  in {
 
-  clang-unwrapped = callPackage ./clang {
+    llvm = overrideManOutput (callPackage ./llvm.nix {
-    inherit clang-tools-extra_src stdenv;
+      inherit compiler-rt_src;
-  };
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
+    libclang = tools.clang-unwrapped.lib;
-    llvm = overrideManOutput llvm;
+    llvm-manpages = lowPrio tools.llvm.man;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools

pkgs/development/compilers/llvm/6/default.nix

@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "6.0.0";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
+  tools = let
-    inherit compiler-rt_src stdenv;
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-  };
+  in {
 
-  clang-unwrapped = callPackage ./clang {
+    llvm = overrideManOutput (callPackage ./llvm.nix {
-    inherit clang-tools-extra_src stdenv;
+      inherit compiler-rt_src;
-  };
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
+    libclang = tools.clang-unwrapped.lib;
-    llvm = overrideManOutput llvm;
+    llvm-manpages = lowPrio tools.llvm.man;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools

pkgs/top-level/all-packages.nix

@@ -6700,51 +6700,51 @@ with pkgs;
   llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
     isl = isl_0_12;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
     isl = isl_0_14;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_37;
+    buildLlvmTools = buildPackages.llvmPackages_37.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_37;
+    targetLlvmLibraries = targetPackages.llvmPackages_37.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_38;
+    buildLlvmTools = buildPackages.llvmPackages_38.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_38;
+    targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_39;
+    buildLlvmTools = buildPackages.llvmPackages_39.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_39;
+    targetLlvmLibraries = targetPackages.llvmPackages_39.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_4;
+    buildLlvmTools = buildPackages.llvmPackages_4.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_4;
+    targetLlvmLibraries = targetPackages.llvmPackages_4.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_5;
+    buildLlvmTools = buildPackages.llvmPackages_5.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_5;
+    targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
   } // stdenv.lib.optionalAttrs stdenv.isDarwin {
     cmake = cmake.override {
       isBootstrap = true;
@@ -6753,15 +6753,15 @@ with pkgs;
     libxml2 = libxml2.override { pythonSupport = false; };
     python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
   llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_6;
+    buildLlvmTools = buildPackages.llvmPackages_6.tools;
-    targetLlvmPackages = targetPackages.llvmPackages_6;
+    targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
   manticore = callPackage ../development/compilers/manticore { };