aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Valla <valla.francesco@gmail.com>2018-06-02 16:09:22 +0200
committerRob Landley <rob@landley.net>2018-06-03 12:44:28 -0500
commit5efc1674a81ce1fd423ca8aac2ce3c02144751fc (patch)
tree7c602f61c14387bc3ba6e6000f27a3d2a46e4b84
parent1e90addea792297259803028911ca88462e97732 (diff)
downloadtoybox-5efc1674a81ce1fd423ca8aac2ce3c02144751fc.tar.gz
call strip as $STRIP
This is useful e.g. for cross toolchains that define $CC and $STRIP instead of $CROSS_COMPILE.
-rw-r--r--Makefile2
-rwxr-xr-xconfigure1
-rwxr-xr-xscripts/make.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c38c795b..26038e91 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
HOSTCC?=cc
-export CROSS_COMPILE CFLAGS OPTIMIZE LDOPTIMIZE CC HOSTCC V
+export CROSS_COMPILE CFLAGS OPTIMIZE LDOPTIMIZE CC HOSTCC V STRIP
all: toybox
diff --git a/configure b/configure
index 14c9c659..a9b88976 100755
--- a/configure
+++ b/configure
@@ -28,6 +28,7 @@ CFLAGS="$CFLAGS -funsigned-char"
# you call scripts/make.sh and friends directly.
[ -z "$CC" ] && CC=cc
+[ -z "$STRIP" ] & STRIP=strip
# If HOSTCC needs CFLAGS or LDFLAGS, just add them to the variable
# ala HOSTCC="blah-cc --static"
diff --git a/scripts/make.sh b/scripts/make.sh
index 1119ed9d..72d53709 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -368,7 +368,7 @@ done
do_loudly $BUILD $LNKFILES $LINK || exit 1
if [ ! -z "$NOSTRIP" ] ||
- ! do_loudly ${CROSS_COMPILE}strip "$UNSTRIPPED" -o "$OUTNAME"
+ ! do_loudly ${CROSS_COMPILE}${STRIP} "$UNSTRIPPED" -o "$OUTNAME"
then
echo "strip failed, using unstripped" && cp "$UNSTRIPPED" "$OUTNAME" ||
exit 1