alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
# set that can be built with that stdenv.
stageFun =
{gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
{gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
let
@ -93,7 +93,7 @@ rec {
cc = gccPlain;
isGNU = true;
libc = glibc;
inherit binutils coreutils;
inherit binutils coreutils gnugrep;
name = name;
stdenv = stage0.stdenv;
};
@ -125,6 +125,7 @@ rec {
glibc = null;
binutils = null;
coreutils = null;
gnugrep = null;
name = null;
overrides = pkgs: {
@ -160,6 +161,7 @@ rec {
inherit (stage0.pkgs) glibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper";
# Rebuild binutils to use from stage2 onwards.
@ -184,6 +186,7 @@ rec {
inherit (stage1.pkgs) glibc;
binutils = stage1.pkgs.binutils;
coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper";
overrides = pkgs: {
@ -200,6 +203,7 @@ rec {
gccPlain = bootstrapTools;
inherit (stage2.pkgs) glibc binutils;
coreutils = bootstrapTools;
gnugrep = bootstrapTools;
name = "bootstrap-gcc-wrapper";
overrides = pkgs: rec {
@ -227,7 +231,7 @@ rec {
# Construct a fourth stdenv that uses the new GCC. But coreutils is
# still from the bootstrap tools.
stage4 = stageFun {
inherit (stage3.pkgs) gccPlain glibc binutils;
inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
coreutils = bootstrapTools;
name = "";
@ -244,7 +248,7 @@ rec {
isGNU = true;
cc = stage4.stdenv.cc.cc;
libc = stage4.pkgs.glibc;
inherit (stage4.pkgs) binutils coreutils;
inherit (stage4.pkgs) binutils coreutils gnugrep;
name = "";
stdenv = stage4.stdenv;
shell = stage4.pkgs.bash + "/bin/bash";