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

Linux stdenv update: pass gnugrep to cc-wrapper

Browse Source
This commit is contained in:
Anthony Cowley 2016-01-24 00:18:32 -05:00
parent d96893647d
commit 5986aecc4c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ rec {
# the bootstrap. In all stages, we build an stdenv and the package # the bootstrap. In all stages, we build an stdenv and the package
# set that can be built with that stdenv. # set that can be built with that stdenv.
stageFun = stageFun =
{gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}: {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
let let
@ -93,7 +93,7 @@ rec {
cc = gccPlain; cc = gccPlain;
isGNU = true; isGNU = true;
libc = glibc; libc = glibc;
inherit binutils coreutils; inherit binutils coreutils gnugrep;
name = name; name = name;
stdenv = stage0.stdenv; stdenv = stage0.stdenv;
}; };
@ -125,6 +125,7 @@ rec {
glibc = null; glibc = null;
binutils = null; binutils = null;
coreutils = null; coreutils = null;
gnugrep = null;
name = null; name = null;
overrides = pkgs: { overrides = pkgs: {
@ -160,6 +161,7 @@ rec {
inherit (stage0.pkgs) glibc; inherit (stage0.pkgs) glibc;
binutils = bootstrapTools; binutils = bootstrapTools;
coreutils = bootstrapTools; coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
# Rebuild binutils to use from stage2 onwards. # Rebuild binutils to use from stage2 onwards.
@ -184,6 +186,7 @@ rec {
inherit (stage1.pkgs) glibc; inherit (stage1.pkgs) glibc;
binutils = stage1.pkgs.binutils; binutils = stage1.pkgs.binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
overrides = pkgs: { overrides = pkgs: {
@ -200,6 +203,7 @@ rec {
gccPlain = bootstrapTools; gccPlain = bootstrapTools;
inherit (stage2.pkgs) glibc binutils; inherit (stage2.pkgs) glibc binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
overrides = pkgs: rec { overrides = pkgs: rec {
@ -227,7 +231,7 @@ rec {
# Construct a fourth stdenv that uses the new GCC. But coreutils is # Construct a fourth stdenv that uses the new GCC. But coreutils is
# still from the bootstrap tools. # still from the bootstrap tools.
stage4 = stageFun { stage4 = stageFun {
inherit (stage3.pkgs) gccPlain glibc binutils; inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = ""; name = "";
@ -244,7 +248,7 @@ rec {
isGNU = true; isGNU = true;
cc = stage4.stdenv.cc.cc; cc = stage4.stdenv.cc.cc;
libc = stage4.pkgs.glibc; libc = stage4.pkgs.glibc;
inherit (stage4.pkgs) binutils coreutils; inherit (stage4.pkgs) binutils coreutils gnugrep;
name = ""; name = "";
stdenv = stage4.stdenv; stdenv = stage4.stdenv;
shell = stage4.pkgs.bash + "/bin/bash"; shell = stage4.pkgs.bash + "/bin/bash";