JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving back my attempt to build binutils before glibc in stdenvLinux.

Browse Source 
What I did results in segfaults in built binaries.

svn merge -c -23370 ^/nixpkgs/branches/stdenv-updates


svn path=/nixpkgs/branches/stdenv-updates/; revision=23376
This commit is contained in:
Lluís Batlle i Rossell 2010-08-23 19:59:06 +00:00
parent cdbe8d495c
commit 643eb3435e
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,30 +160,10 @@ rec {
bootStdenv = stdenvLinuxBoot1; 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, # 3) Build Glibc with the bootstrap tools. The result is the full,
# dynamically linked, final Glibc. # dynamically linked, final Glibc.
stdenvLinuxGlibc = stdenvLinuxBoot1halfPkgs.glibc; stdenvLinuxGlibc = stdenvLinuxBoot1Pkgs.glibc;
# 4) Construct a second stdenv identical to the first, except that # 4) Construct a second stdenv identical to the first, except that
@ -197,7 +177,7 @@ rec {
}; };
overrides = { overrides = {
glibc = stdenvLinuxGlibc; glibc = stdenvLinuxGlibc;
inherit (stdenvLinuxBoot1halfPkgs) perl; inherit (stdenvLinuxBoot1Pkgs) perl;
}; };
inherit fetchurl; inherit fetchurl;
}) ["gcc" "binutils"]; }) ["gcc" "binutils"];
@ -235,7 +215,7 @@ rec {
name = ""; name = "";
}; };
overrides = { overrides = {
inherit (stdenvLinuxBoot1halfPkgs) perl; inherit (stdenvLinuxBoot1Pkgs) perl;
}; };
inherit fetchurl; inherit fetchurl;
}; };