mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Adding building 'binutils' before building the 'glibc' in stdenv-linux.

Browse source 
This should allow keeping the i686-linux boostrap-tools.
I updated some days ago the x86_64-linux bootstrap-tools, but that update is
not needed anymore. We can revert that boostrap-tools update if anyone wants.
Pro:
- new gcc building gcc and glibc.
Contra:
- maybe some old systems (patched red had kernels come to mind) break with that update?


svn path=/nixpkgs/branches/stdenv-updates/; revision=23370
This commit is contained in:
Lluís Batlle i Rossell 2010-08-23 18:05:19 +00:00
parent a480f92f9d
commit d2bcf1340c
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/stdenv/linux/default.nix
View file

@ -160,10 +160,30 @@ rec {
bootStdenv = stdenvLinuxBoot1;
};
# Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
stdenvLinuxBoot1half = stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bootstrapTools;
};
inherit fetchurl;
};
# 2) These are the packages that we can build with the first
# stdenv. We only need Glibc (in step 3).
stdenvLinuxBoot1halfPkgs = allPackages {
inherit system platform;
bootStdenv = stdenvLinuxBoot1half;
};
# 3) Build Glibc with the bootstrap tools. The result is the full,
# dynamically linked, final Glibc.
stdenvLinuxGlibc = stdenvLinuxBoot1Pkgs.glibc;
stdenvLinuxGlibc = stdenvLinuxBoot1halfPkgs.glibc;
# 4) Construct a second stdenv identical to the first, except that
@ -177,7 +197,7 @@ rec {
};
overrides = {
glibc = stdenvLinuxGlibc;
inherit (stdenvLinuxBoot1Pkgs) perl;
inherit (stdenvLinuxBoot1halfPkgs) perl;
};
inherit fetchurl;
}) ["gcc" "binutils"];
@ -215,7 +235,7 @@ rec {
name = "";
};
overrides = {
inherit (stdenvLinuxBoot1Pkgs) perl;
inherit (stdenvLinuxBoot1halfPkgs) perl;
};
inherit fetchurl;
};