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

* Don't strip all symbols from $out/bin by default, since it makes

Browse Source 
stack traces impossible.
* When stripping all symbols on Darwin, don't use the "-s" flag
  since it has a completely different meaning (it takes an argument 
  specifying a file containing a list of symbols).

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10809
This commit is contained in:
Eelco Dolstra 2008-02-21 16:20:51 +00:00
parent 5e985bc375
commit e7570bb9cf
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/stdenv/darwin/prehook.sh
View File

@ -3,3 +3,4 @@ export NIX_DONT_SET_RPATH=1
export NIX_NO_SELF_RPATH=1 export NIX_NO_SELF_RPATH=1
dontFixLibtool=1 dontFixLibtool=1
NIX_STRIP_DEBUG=0 NIX_STRIP_DEBUG=0
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"

17
pkgs/stdenv/generic/setup.sh
View File

@ -232,7 +232,7 @@ stripDirs() {
dirs=${dirsNew} dirs=${dirsNew}
if test -n "${dirs}"; then if test -n "${dirs}"; then
echo $dirs echo "stripping (with flags $stripFlags) in $dirs"
find $dirs -type f -print0 | xargs -0 strip $stripFlags || true find $dirs -type f -print0 | xargs -0 strip $stripFlags || true
fi fi
} }
@ -715,12 +715,15 @@ fixupPhase() {
# TODO: strip _only_ ELF executables, and return || fail here... # TODO: strip _only_ ELF executables, and return || fail here...
if test -z "$dontStrip"; then if test -z "$dontStrip"; then
stripDebugList=${stripDebugList:-lib} stripDebugList=${stripDebugList:-lib bin sbin}
echo "stripping debuging symbols from files in $stripDebugList" if test -n "$stripDebugList"; then
stripDirs "$stripDebugList" -S stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
stripAllList=${stripAllList:-bin sbin} fi
echo "stripping all symbols from files in $stripAllList"
stripDirs "$stripAllList" -s stripAllList=${stripAllList:-}
if test -n "$stripAllList"; then
stripDirs "$stripAllList" "${stripAllFlags:--s}"
fi
fi fi
if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then