release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700...

[android-x86/external-toybox.git] / configure

diff --git a/configure b/configure
index 9b7bb36..a7a427f 100644 (file)
--- a/configure
+++ b/configure
@@ -5,10 +5,21 @@
 # A synonym.
 [ -z "$CROSS_COMPILE" ] && CROSS_COMPILE="$CROSS"
 
-[ -z "$CFLAGS" ] && CFLAGS="-Wall -Wundef -Wno-char-subscripts"
+# CFLAGS and OPTIMIZE are different so you can add extra CFLAGS without
+# disabling default optimizations
+[ -z "$CFLAGS" ] && CFLAGS="-Wall -Wundef -Wno-char-subscripts -Werror=implicit-function-declaration"
+# 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 -Wl,--gc-sections"
-[ -z "$CC" ] && CC="cc"
-CC="${CROSS_COMPILE}${CC}"
-[ -z "$STRIP" ] && STRIP="${CROSS_COMPILE}strip"
-[ -z "$HOSTCC" ] && HOSTCC=gcc
+[ -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 "$CC" ] && CC=cc
+
+# If HOSTCC needs CFLAGS or LDFLAGS, just add them to the variable
+# ala HOSTCC="blah-cc --static"
+[ -z "$HOSTCC" ] && HOSTCC=cc