Skip to content

Commit

Permalink
glibc: stop using bootstrap libgcc_s
Browse files Browse the repository at this point in the history
Let's try this again. See
NixOS#36947 and
NixOS#36948
for history
  • Loading branch information
Gaelan committed Apr 28, 2022
1 parent dc3abef commit e545700
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions pkgs/development/libraries/glibc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,6 @@ callPackage ./common.nix { inherit stdenv; } {
])
]);

# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
# store path than that determined when built (as a source for the
# bootstrap-tools tarball)
# Building from a proper gcc staying in the path where it was installed,
# libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
# any special hack.
preInstall = ''
if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
mkdir -p $out/lib
cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
# the .so It used to be a symlink, but now it is a script
cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
fi
'';

postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then ''
echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
Expand Down

1 comment on commit e545700

@ajs124
Copy link

@ajs124 ajs124 commented on e545700 Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you done some tests with this? NixOS#36948 was reverted due to some breakage, but it seems like we should try to fix that breakage instead of doing what we're currently doing.

Please sign in to comment.