strip: --strip-all in libexec, bin, sbin

NixOS#21667 (comment) NixOS#21667 (comment)
lukateras · Oct 31, 2017 · 80f4640 · 80f4640
1 parent e2edcca
commit 80f4640
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
@@ -4,14 +4,14 @@ fixupOutputHooks+=(_doStrip)
 
 _doStrip() {
     if [ -z "$dontStrip" ]; then
-        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
+        stripDebugList=${stripDebugList:-lib lib32 lib64}
         if [ -n "$stripDebugList" ]; then
-            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
+            stripDirs "$stripDebugList" "${stripDebugFlags:--strip-debug --strip-unneeded}"
         fi
 
-        stripAllList=${stripAllList:-}
+        stripAllList=${stripAllList:-libexec bin sbin}
         if [ -n "$stripAllList" ]; then
-            stripDirs "$stripAllList" "${stripAllFlags:--s}"
+            stripDirs "$stripAllList" "${stripAllFlags:--strip-all}"
         fi
     fi
 }