diff options
| author | Rob Landley <rob@landley.net> | 2015-03-06 15:11:38 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2015-03-06 15:11:38 -0600 |
| commit | 1f44b5f0b236df260cee8741efce8a2887a59e36 (patch) | |
| tree | 617079e8c9809cca6321e9ffe12b5a167c564479 | |
| parent | 3b741474b722723a208c9ecc3595451884a887c7 (diff) | |
| download | toybox-1f44b5f0b236df260cee8741efce8a2887a59e36.tar.gz | |
Yank $STRIP from config (and STRIP=no weirdness) and just allow strip to fail.
| -rw-r--r-- | configure | 1 | ||||
| -rwxr-xr-x | scripts/make.sh | 7 |
2 files changed, 3 insertions, 5 deletions
@@ -16,7 +16,6 @@ CFLAGS="$CFLAGS -funsigned-char" [ -z "$LDOPTIMIZE" ] && LDOPTIMIZE="-Wl,--gc-sections" [ -z "$CC" ] && CC=cc -[ -z "$STRIP" ] && STRIP=strip # set STRIP=no to skip stripping entirely # 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 9e4b83e9..4cb19272 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. |