changeset 918:18f052489f5d

Make ccwrap, hello, busybox, and toybox respect SKIP_STRIP and CFLAGS=-g.
author Rob Landley <rob@landley.net>
date Thu, 03 Dec 2009 03:39:53 -0600
parents a181d81540ed
children 8b69eeb17ebf
files root-filesystem.sh sources/sections/busybox.sh sources/sections/ccwrap.sh sources/sections/toybox.sh
diffstat 4 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/root-filesystem.sh	Thu Dec 03 01:38:21 2009 -0600
+++ b/root-filesystem.sh	Thu Dec 03 03:39:53 2009 -0600
@@ -150,8 +150,8 @@
 # Put statically and dynamically linked hello world programs on there for
 # test purposes.
 
-"${ARCH}-cc" "${SOURCES}/toys/hello.c" -Os -s -o "$ROOT_TOPDIR/bin/hello-dynamic" &&
-"${ARCH}-cc" "${SOURCES}/toys/hello.c" -Os -s -static -o "$ROOT_TOPDIR/bin/hello-static"
+"${ARCH}-cc" "${SOURCES}/toys/hello.c" -Os "$CFLAGS" -o "$ROOT_TOPDIR/bin/hello-dynamic" &&
+"${ARCH}-cc" "${SOURCES}/toys/hello.c" -Os "$CFLAGS" -static -o "$ROOT_TOPDIR/bin/hello-static"
 
 [ $? -ne 0 ] && dienow
 
--- a/sources/sections/busybox.sh	Thu Dec 03 01:38:21 2009 -0600
+++ b/sources/sections/busybox.sh	Thu Dec 03 03:39:53 2009 -0600
@@ -11,7 +11,7 @@
 cp .config "$WORK"/config-busybox &&
 LDFLAGS="$LDFLAGS $BUSYBOX_STATIC" make -j $CPUS $VERBOSITY $DO_CROSS &&
 make busybox.links &&
-cp busybox "${STAGE_DIR}" || dienow
+cp busybox${SKIP_STRIP:+_unstripped} "${STAGE_DIR}/busybox" || dienow
 
 for i in $(sed 's@.*/@@' busybox.links)
 do
--- a/sources/sections/ccwrap.sh	Thu Dec 03 01:38:21 2009 -0600
+++ b/sources/sections/ccwrap.sh	Thu Dec 03 03:39:53 2009 -0600
@@ -49,7 +49,7 @@
 
 # Build wrapper binary
 
-"$TEMP" "$SOURCES/toys/ccwrap.c" -Os -s \
+"$TEMP" "$SOURCES/toys/ccwrap.c" -Os "$CFLAGS" \
   -o "$STAGE_DIR/bin/${PROGRAM_PREFIX}cc" $LIBTYPE $STATIC_FLAGS \
   -DGCC_UNWRAPPED_NAME='"'"${PROGRAM_PREFIX}rawcc"'"' || dienow
 
--- a/sources/sections/toybox.sh	Thu Dec 03 01:38:21 2009 -0600
+++ b/sources/sections/toybox.sh	Thu Dec 03 03:39:53 2009 -0600
@@ -8,7 +8,6 @@
 
 if [ -z "$USE_TOYBOX" ]
 then
-  mv toybox "$STAGE_DIR" &&
   ln -sf toybox "$STAGE_DIR"/patch &&
   ln -sf toybox "$STAGE_DIR"/oneit &&
   ln -sf toybox "$STAGE_DIR"/netcat || dienow
@@ -16,4 +15,6 @@
   make install_flat PREFIX="$STAGE_DIR" || dienow
 fi
 
+cp toybox${SKIP_STRIP:+_unstripped} "$STAGE_DIR/toybox"
+
 cleanup