treewide: Try to make a few bootstrapping things more consistent

- Introduce `preLibcCrossHeaders` to bootstrap libgcc and compiler-rt
  the same way.

- Organize LLVM bintools as `bintools{-unwrapped,,NoLibc}` for
  consistency with GNU Binutils and Apple's cctools.

- Do Android changes for all `llvmPackages` for consistency.

- Improve the way the default GCC and LLVM versions are selected.
This commit is contained in:
John Ericson
2021-05-12 00:14:56 +00:00
parent e0d3c9d031
commit 37194a325d
19 changed files with 301 additions and 169 deletions
+2 -1
View File
@@ -2,6 +2,7 @@
, buildPackages, pkgs, targetPackages
, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
, stdenv, splicePackages, newScope
, preLibcCrossHeaders
}:
let
@@ -52,7 +53,7 @@ impure-cmds // apple-source-releases // {
};
binutilsNoLibc = pkgs.wrapBintoolsWith {
libc = null;
libc = preLibcCrossHeaders;
bintools = self.binutils-unwrapped;
};