aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhewg2011-03-10 20:11:15 +0100
committerdhewg2011-03-10 21:17:59 +0100
commita5a8af86ee43ead26f1fc73f48661da878603711 (patch)
tree64a9d396816b15675146dc6703aa984074886899
parentfb0b9dd7b32ae668c16e92d756007764cacb7d15 (diff)
downloadscummvm-rg350-a5a8af86ee43ead26f1fc73f48661da878603711.tar.gz
scummvm-rg350-a5a8af86ee43ead26f1fc73f48661da878603711.tar.bz2
scummvm-rg350-a5a8af86ee43ead26f1fc73f48661da878603711.zip
CONFIGURE: Change Android debug flags logic
Use --enable-debug instead of not --enable-release
-rwxr-xr-xconfigure13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure b/configure
index 90c6275afc..eeafe93966 100755
--- a/configure
+++ b/configure
@@ -1515,10 +1515,10 @@ case $_host_os in
esac
CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
- if test "$_release_build" = yes; then
- CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
- else
+ if test "$_debug_build" = yes; then
CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+ else
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
fi
CXXFLAGS="$CXXFLAGS -finline-limit=300"
CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
@@ -2973,7 +2973,12 @@ fi
case $_backend in
android)
# ssp at this point so the cxxtests link
- CXXFLAGS="$CXXFLAGS -fstack-protector -Wa,--noexecstack"
+ if test "$_debug_build" = yes; then
+ CXXFLAGS="$CXXFLAGS -fstack-protector"
+ else
+ CXXFLAGS="$CXXFLAGS -fno-stack-protector"
+ fi
+ CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
static_libs=''