From 3f46cdcb5b903fe1c07707fea9ee24ae09d964b2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 8 Sep 2023 15:14:59 -0300 Subject: [PATCH] Revert "Merge pull request #253760 from chivay/bootstrap-scrt" This reverts commit ab66640da31a80c4cfd38e8f495c23ef2f7e254b, reversing changes made to c08b005e0f6ce26d0269e9ac7e12747a29f822fb. The changes were merged without the associated bootstrap updates. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 1334c13ad170..d6c4da0ab2be 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -78,8 +78,7 @@ in with pkgs; rec { cp -d ${libc.out}/lib/libutil*.so* $out/lib cp -d ${libc.out}/lib/libnss*.so* $out/lib cp -d ${libc.out}/lib/libresolv*.so* $out/lib - # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds - cp -d ${libc.out}/lib/*.o $out/lib + cp -d ${libc.out}/lib/crt?.o $out/lib # Hacky compat with our current unpack-bootstrap-tools.sh ln -s librt.so "$out"/lib/librt-dummy.so