diff options
Diffstat (limited to 'pkgs/development/compilers/llvm/3.7/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/3.7/default.nix | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 8f73645afc0..4e1a0ef6409 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/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 -, 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 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; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); + lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); + in { - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); + stdenv = overrideCC stdenv buildLlvmTools.clang; - lldb = callPackage ./lldb.nix {}; + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; }; -in self + +in { inherit tools libraries; } // libraries // tools |