From 8bcfad7e9c1a3412103dc14c1fa7eefd6d2b0b4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Nov 2008 16:11:59 +0000
Subject: [PATCH] * Strip in libexec. * In stripDirs: use xargs -r, otherwise
 when there is nothing to   strip, strip prints its help text.  Harmless but
 annoying.

svn path=/nixpkgs/trunk/; revision=13492
---
 pkgs/stdenv/generic/setup-new.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh
index 5c8d935c7996..52058cee0c9a 100644
--- a/pkgs/stdenv/generic/setup-new.sh
+++ b/pkgs/stdenv/generic/setup-new.sh
@@ -255,7 +255,7 @@ stripDirs() {
 
     if test -n "${dirs}"; then
         header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 strip $stripFlags || true
+        find $dirs -type f -print0 | xargs -0 -r strip $stripFlags || true
         stopNest
     fi
 }
@@ -713,7 +713,7 @@ fixupPhase() {
 
     # TODO: strip _only_ ELF executables, and return || fail here...
     if test -z "$dontStrip"; then
-        stripDebugList=${stripDebugList:-lib bin sbin}
+        stripDebugList=${stripDebugList:-lib libexec bin sbin}
         if test -n "$stripDebugList"; then
             stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
         fi