Merge pull request #224945 from amjoseph-nixpkgs/pr/patchelf/confusion
This commit is contained in:
commit
b99030167e
|
@ -322,11 +322,11 @@ in
|
|||
assert isFromBootstrapFiles prevStage.gcc-unwrapped;
|
||||
assert isFromBootstrapFiles prevStage.coreutils;
|
||||
assert isFromBootstrapFiles prevStage.gnugrep;
|
||||
assert isBuiltByBootstrapFilesCompiler prevStage.patchelf;
|
||||
stageFun prevStage {
|
||||
name = "bootstrap-stage-xgcc";
|
||||
overrides = final: prev: {
|
||||
inherit (prevStage) ccWrapperStdenv coreutils gnugrep gettext bison texinfo zlib gnum4 perl;
|
||||
patchelf = bootstrapTools;
|
||||
inherit (prevStage) ccWrapperStdenv coreutils gnugrep gettext bison texinfo zlib gnum4 perl patchelf;
|
||||
${localSystem.libc} = getLibc prevStage;
|
||||
gmp = prev.gmp.override { cxx = false; };
|
||||
gcc-unwrapped =
|
||||
|
@ -399,6 +399,7 @@ in
|
|||
assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
|
||||
assert isFromBootstrapFiles prevStage.coreutils;
|
||||
assert isFromBootstrapFiles prevStage.gnugrep;
|
||||
assert isBuiltByBootstrapFilesCompiler prevStage.patchelf;
|
||||
stageFun prevStage {
|
||||
name = "bootstrap-stage2";
|
||||
|
||||
|
@ -476,6 +477,7 @@ in
|
|||
assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
|
||||
assert isFromBootstrapFiles prevStage.coreutils;
|
||||
assert isFromBootstrapFiles prevStage.gnugrep;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.patchelf;
|
||||
assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ gmp isl_0_20 libmpc mpfr ]);
|
||||
stageFun prevStage {
|
||||
name = "bootstrap-stage3";
|
||||
|
@ -516,6 +518,7 @@ in
|
|||
assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
|
||||
assert isFromBootstrapFiles prevStage.coreutils;
|
||||
assert isFromBootstrapFiles prevStage.gnugrep;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.patchelf;
|
||||
stageFun prevStage {
|
||||
name = "bootstrap-stage4";
|
||||
|
||||
|
@ -576,6 +579,7 @@ in
|
|||
assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.coreutils;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.gnugrep;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.patchelf;
|
||||
{
|
||||
inherit config overlays;
|
||||
stdenv = import ../generic rec {
|
||||
|
@ -665,5 +669,6 @@ in
|
|||
assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.coreutils;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.gnugrep;
|
||||
assert isBuiltByNixpkgsCompiler prevStage.patchelf;
|
||||
{ inherit (prevStage) config overlays stdenv; })
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue