From 64b3350537ad8ecfd8b4d3fd8fb31b7deb41d014 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Mar 2018 20:06:43 -0500 Subject: [PATCH] glibc: don't use bootstrap libgcc_s Fixes #36947 --- pkgs/development/libraries/glibc/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 8b17ff9e5585..ce0a689cdb7f 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -31,22 +31,6 @@ callPackage ./common.nix { inherit stdenv; } { # does not work. hardeningDisable = [ "stackprotector" "fortify" ]; - # 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 test -n "$installLocales"; then make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales