tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
Linux stdenv update: pass gnugrep to cc-wrapper
Anthony Cowley
10 years ago
5986aecc
d9689364
+8
-4
1 changed file
expand all
collapse all
unified
split
pkgs
stdenv
linux
default.nix
+8
-4
pkgs/stdenv/linux/default.nix
···
64
# the bootstrap. In all stages, we build an stdenv and the package
65
# set that can be built with that stdenv.
66
stageFun =
67
-
{gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
68
69
let
70
···
93
cc = gccPlain;
94
isGNU = true;
95
libc = glibc;
96
-
inherit binutils coreutils;
97
name = name;
98
stdenv = stage0.stdenv;
99
};
···
125
glibc = null;
126
binutils = null;
127
coreutils = null;
0
128
name = null;
129
130
overrides = pkgs: {
···
160
inherit (stage0.pkgs) glibc;
161
binutils = bootstrapTools;
162
coreutils = bootstrapTools;
0
163
name = "bootstrap-gcc-wrapper";
164
165
# Rebuild binutils to use from stage2 onwards.
···
184
inherit (stage1.pkgs) glibc;
185
binutils = stage1.pkgs.binutils;
186
coreutils = bootstrapTools;
0
187
name = "bootstrap-gcc-wrapper";
188
189
overrides = pkgs: {
···
200
gccPlain = bootstrapTools;
201
inherit (stage2.pkgs) glibc binutils;
202
coreutils = bootstrapTools;
0
203
name = "bootstrap-gcc-wrapper";
204
205
overrides = pkgs: rec {
···
227
# Construct a fourth stdenv that uses the new GCC. But coreutils is
228
# still from the bootstrap tools.
229
stage4 = stageFun {
230
-
inherit (stage3.pkgs) gccPlain glibc binutils;
231
coreutils = bootstrapTools;
232
name = "";
233
···
244
isGNU = true;
245
cc = stage4.stdenv.cc.cc;
246
libc = stage4.pkgs.glibc;
247
-
inherit (stage4.pkgs) binutils coreutils;
248
name = "";
249
stdenv = stage4.stdenv;
250
shell = stage4.pkgs.bash + "/bin/bash";
···
64
# the bootstrap. In all stages, we build an stdenv and the package
65
# set that can be built with that stdenv.
66
stageFun =
67
+
{gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
68
69
let
70
···
93
cc = gccPlain;
94
isGNU = true;
95
libc = glibc;
96
+
inherit binutils coreutils gnugrep;
97
name = name;
98
stdenv = stage0.stdenv;
99
};
···
125
glibc = null;
126
binutils = null;
127
coreutils = null;
128
+
gnugrep = null;
129
name = null;
130
131
overrides = pkgs: {
···
161
inherit (stage0.pkgs) glibc;
162
binutils = bootstrapTools;
163
coreutils = bootstrapTools;
164
+
gnugrep = bootstrapTools;
165
name = "bootstrap-gcc-wrapper";
166
167
# Rebuild binutils to use from stage2 onwards.
···
186
inherit (stage1.pkgs) glibc;
187
binutils = stage1.pkgs.binutils;
188
coreutils = bootstrapTools;
189
+
gnugrep = bootstrapTools;
190
name = "bootstrap-gcc-wrapper";
191
192
overrides = pkgs: {
···
203
gccPlain = bootstrapTools;
204
inherit (stage2.pkgs) glibc binutils;
205
coreutils = bootstrapTools;
206
+
gnugrep = bootstrapTools;
207
name = "bootstrap-gcc-wrapper";
208
209
overrides = pkgs: rec {
···
231
# Construct a fourth stdenv that uses the new GCC. But coreutils is
232
# still from the bootstrap tools.
233
stage4 = stageFun {
234
+
inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
235
coreutils = bootstrapTools;
236
name = "";
237
···
248
isGNU = true;
249
cc = stage4.stdenv.cc.cc;
250
libc = stage4.pkgs.glibc;
251
+
inherit (stage4.pkgs) binutils coreutils gnugrep;
252
name = "";
253
stdenv = stage4.stdenv;
254
shell = stage4.pkgs.bash + "/bin/bash";