diff options
Diffstat (limited to 'pkgs/development/compilers/llvm/4')
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 594397bdbbc0..fecf65136bcd 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/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 -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous 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 { - inherit compiler-rt_src stdenv; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + tools = let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { - self = { - llvm = overrideManOutput llvm; - clang-unwrapped = overrideManOutput clang-unwrapped; + llvm = overrideManOutput (callPackage ./llvm.nix { + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; + }); + clang-unwrapped = overrideManOutput (callPackage ./clang { + inherit clang-tools-extra_src; + }); - libclang = self.clang-unwrapped.lib; - llvm-manpages = lowPrio self.llvm.man; - clang-manpages = lowPrio self.clang-unwrapped.man; + libclang = tools.clang-unwrapped.lib; + llvm-manpages = lowPrio tools.llvm.man; + clang-manpages = lowPrio tools.clang-unwrapped.man; - 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; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + 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 |