colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Just strip everything by default"

Browse Source 
This reverts commit 2362891dc8. The patch
is broken. :-(
This commit is contained in:
Peter Simons 2016-05-04 13:40:53 +02:00
parent 30ef92e0ff
commit 397c75aeb4
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/build-support/setup-hooks/strip.sh
View File

@ -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
}