From 91c13172721c979710f33906a7a56c0a67cb8214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Jun 2016 12:11:21 +0200 Subject: [PATCH] glibc: fixup retaining bootstrap-tools reference https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 --- pkgs/development/libraries/glibc/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 0ea6b4b938b2..2a1652a55011 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -72,6 +72,14 @@ in # Get rid of more unnecessary stuff. rm -rf $out/var $out/sbin/sln + # For some reason these aren't stripped otherwise and retain reference + # to bootstrap-tools; on cross-arm this stripping would break objects. + if [ -z "$crossConfig" ]; then + for i in "$out"/lib/*.a; do + strip -S "$i" + done + fi + # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required # for dynamically-linked applications.