# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1281319301 18000
# Node ID 78e786334c5b73d2ddfb7cb0a14fedfaf84369e4
# Parent  8b1017be9de81dc047051add7dc4e6bd341bcaf0
Polish the strip logic a bit.

diff -r 8b1017be9de8 -r 78e786334c5b root-filesystem.sh
--- a/root-filesystem.sh	Sun Aug 08 20:57:58 2010 -0500
+++ b/root-filesystem.sh	Sun Aug 08 21:01:41 2010 -0500
@@ -27,4 +27,12 @@
 yes 'n' | cp -ia "$BUILD/native-compiler-$ARCH/." \
   "$BUILD/root-filesystem-$ARCH$USRDIR" 2>/dev/null || dienow
 
+# Strip everything again, just to be sure.
+
+if [ -z "$SKIP_STRIP" ]
+then
+  "${ARCH}-strip" --strip-unneeded "$STAGE_DIR"/lib/*.so
+  "${ARCH}-strip" "$STAGE_DIR"/{bin/*,sbin/*}
+fi
+
 create_stage_tarball
diff -r 8b1017be9de8 -r 78e786334c5b simple-root-filesystem.sh
--- a/simple-root-filesystem.sh	Sun Aug 08 20:57:58 2010 -0500
+++ b/simple-root-filesystem.sh	Sun Aug 08 21:01:41 2010 -0500
@@ -83,15 +83,15 @@
      "$("$ARCH-cc" --print-search-dirs | sed -n 's/^libraries: =*//p')" \
       "*.so*" 'cp -H "$DIR/$FILE" "$STAGE_DIR/lib/$FILE"' \
       || dienow) | dotprogress
+
+  [ -z "$SKIP_STRIP" ] &&
+    "${ARCH}-strip" --strip-unneeded "$STAGE_DIR"/lib/*.so
 fi
 
 # Clean up and package the result
 
-if [ -z "$SKIP_STRIP" ]
-then
-  "${ARCH}-strip" "$STAGE_DIR"/{bin/*,sbin/*,libexec/gcc/*/*/*}
-  "${ARCH}-strip" --strip-unneeded "$STAGE_DIR"/lib/*.so
-fi
+[ -z "$SKIP_STRIP" ] &&
+  "${ARCH}-strip" "$STAGE_DIR"/{bin/*,sbin/*}
 
 create_stage_tarball