From 397c75aeb41dbf1b885782c9a31670c87372f561 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 May 2016 13:40:53 +0200
Subject: [PATCH] Revert "Just strip everything by default"

This reverts commit 2362891dc815160e343e52458f25db22508ac487. The patch
is broken. :-(
---
 pkgs/build-support/setup-hooks/strip.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 33ef85e436e..6860c9b9cb9 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -4,7 +4,7 @@ fixupOutputHooks+=(_doStrip)
 
 _doStrip() {
     if [ -z "$dontStrip" ]; then
-        stripDebugList=${stripDebugList:-.}
+        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
         if [ -n "$stripDebugList" ]; then
             stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
         fi
@@ -29,20 +29,8 @@ stripDirs() {
     dirs=${dirsNew}
 
     if [ -n "${dirs}" ]; then
-        header "Stripping (with flags $stripFlags) in$dirs"
-        while IFS= read -r -d $'\0' f; do
-            if out=$(strip $commonStripFlags $stripFlags "$f" 2>&1); then
-                echo "Stripped $f"
-            else
-                # Ignore failures on files that cannot be stripped.
-                if [ "$out" = "strip:$f: File format not recognized" ]; then
-                    continue
-                fi
-
-                echo "Strip failed on file $f: $out"
-                false # fail !
-            fi
-        done < <(find $dirs -type f -print0)
+        header "stripping (with flags $stripFlags) in$dirs"
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
         stopNest
     fi
 }