darwin bootstrapping: Avoid overriding aliases for LLVM

Respect the fix points and aliases by overriding originals.
This commit is contained in:
John Ericson
2018-06-14 15:05:18 -04:00
parent 3e3a9e661d
commit 1eacf21bd4
7 changed files with 67 additions and 53 deletions
@@ -21,7 +21,7 @@ let
let drv-manpages = drv.override { enableManpages = true; }; in
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
tools = let
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -71,9 +71,9 @@ let
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
};
});
libraries = let
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in {
@@ -88,6 +88,6 @@ let
libcxxabi = callPackage ./libc++abi.nix {};
openmp = callPackage ./openmp.nix {};
};
});
in { inherit tools libraries; } // libraries // tools