stdenv: revert gcc hack

See https://github.com/NixOS/nixpkgs/pull/133431#discussion_r805339569
This commit is contained in:
Maximilian Bosch 2022-02-27 15:10:58 +01:00
parent 1077a6e040
commit 91fa7657d1
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E

View File

@ -254,19 +254,6 @@ in
'';
});
gcc-unwrapped = self.stdenvNoCC.mkDerivation {
inherit (prevStage.gcc-unwrapped) name;
dontUnpack = true;
dontBuild = true;
installPhase = ''
mkdir -p $out
cp -ar ${prevStage.gcc-unwrapped}/* $out/
chmod -R a+w $out/
cp -a ${getLibc self}/lib/* $out/lib/
chmod -R a-w $out/
'';
};
# This also contains the full, dynamically linked, final Glibc.
binutils = prevStage.binutils.override {
# Rewrap the binutils with the new glibc, so both the next