From 7bac80fef8d153147de38fbd5586255d836ce980 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 21 Aug 2021 14:09:47 -0700 Subject: [PATCH] stdenv: fix binutils' bootstrap Co-authored-by: TredwellGit --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 84b63e7b8fd0..e1ddfcf28d55 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -172,7 +172,7 @@ in with pkgs; rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${bootBinutils.out}/bin/$i $out/bin done - cp '${lib.getLib binutils.bintools}'/lib/* "$out/lib/" + cp -r '${lib.getLib binutils.bintools}'/lib/* "$out/lib/" chmod -R u+w $out @@ -186,6 +186,7 @@ in with pkgs; rec { nuke-refs $out/bin/* nuke-refs $out/lib/* + nuke-refs $out/lib/*/* nuke-refs $out/libexec/gcc/*/*/* nuke-refs $out/lib/gcc/*/*/* nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*}