summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-03-06 15:11:38 -0600
committerRob Landley <rob@landley.net>2015-03-06 15:11:38 -0600
commit1f44b5f0b236df260cee8741efce8a2887a59e36 (patch)
tree617079e8c9809cca6321e9ffe12b5a167c564479 /scripts
parent3b741474b722723a208c9ecc3595451884a887c7 (diff)
downloadtoybox-1f44b5f0b236df260cee8741efce8a2887a59e36.tar.gz
toybox-1f44b5f0b236df260cee8741efce8a2887a59e36.tar.bz2
toybox-1f44b5f0b236df260cee8741efce8a2887a59e36.zip
Yank $STRIP from config (and STRIP=no weirdness) and just allow strip to fail.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/make.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/make.sh b/scripts/make.sh
index 9e4b83e..4cb1927 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -268,11 +268,10 @@ done
[ $DONE -ne 0 ] && exit 1
do_loudly $BUILD $LFILES $LINK || exit 1
-if [ "$STRIP" == no ]
+if ! do_loudly ${CROSS_COMPILE}strip toybox_unstripped -o toybox
then
- mv toybox_unstripped toybox
-else
- do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
+ echo "strip failed, using unstripped" && cp toybox_unstripped toybox ||
+ exit 1
fi
# gcc 4.4's strip command is buggy, and doesn't set the executable bit on
# its output the way SUSv4 suggests it do so.