X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure;h=7b10f6e595f4e54ea5e9a03d97f980dfa6d648ad;hb=refs%2Fheads%2Fmarshmallow-x86;hp=bf2561b7de16b470801d46785e180b923367f59b;hpb=97abd4a9813b0bd2f16049e2291bba076828408f;p=android-x86%2Fexternal-toybox.git

diff --git a/configure b/configure
index bf2561b7..7b10f6e5 100644
--- a/configure
+++ b/configure
@@ -4,13 +4,22 @@
 
 # A synonym.
 [ -z "$CROSS_COMPILE" ] && CROSS_COMPILE="$CROSS"
+
+# CFLAGS and OPTIMIZE are different so you can add extra CFLAGS without
+# disabling default optimizations
 [ -z "$CFLAGS" ] && CFLAGS="-Wall -Wundef -Wno-char-subscripts"
 # Required for our expected ABI. we're 8-bit clean thus "char" must be unsigned.
 CFLAGS="$CFLAGS -funsigned-char"
+[ -z "$OPTIMIZE" ] && OPTIMIZE="-Os -ffunction-sections -fdata-sections -fno-asynchronous-unwind-tables -fno-strict-aliasing"
+
+# We accept LDFLAGS, but by default don't have anything in it
+[ -z "$LDOPTIMIZE" ] && LDOPTIMIZE="-Wl,--gc-sections"
+
+# The makefile provides defaults for these, so this only gets used if
+# you call scripts/make.sh and friends directly.
 
-[ -z "$OPTIMIZE" ] && OPTIMIZE="-Os -ffunction-sections -fdata-sections -Wl,--gc-sections"
 [ -z "$CC" ] && CC=cc
-[ -z "$STRIP" ] && STRIP=strip
 
-# If HOSTCC needs CFLAGS, add them to the variable ala HOSTCC="blah-cc --static"
-[ -z "$HOSTCC" ] && HOSTCC=gcc
+# If HOSTCC needs CFLAGS or LDFLAGS, just add them to the variable
+# ala HOSTCC="blah-cc --static"
+[ -z "$HOSTCC" ] && HOSTCC=cc