thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Change Android debug flags logic

Browse source 
Use --enable-debug instead of not --enable-release
This commit is contained in:
dhewg 2011-03-10 20:11:15 +01:00
parent fb0b9dd7b3
commit a5a8af86ee
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
configure vendored
View file

@ -1515,10 +1515,10 @@ case $_host_os in
esac esac
CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm" CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables" CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
if test "$_release_build" = yes; then if test "$_debug_build" = yes; then
CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
else
CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
else
CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
fi fi
CXXFLAGS="$CXXFLAGS -finline-limit=300" CXXFLAGS="$CXXFLAGS -finline-limit=300"
CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork" CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
@ -2973,7 +2973,12 @@ fi
case $_backend in case $_backend in
android) android)
# ssp at this point so the cxxtests link # 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" LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
static_libs='' static_libs=''