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

CONFIGURE: Fix cxx test linking for Android

Browse source 
Libraries are now properly detected by configure again.
This commit is contained in:
dhewg 2011-06-15 19:09:50 +02:00
parent 624042eedd
commit b97a5dcfb2
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
configure vendored
View file

@ -2208,16 +2208,9 @@ fi
# #
case $_backend in case $_backend in
android) android)
# ssp at this point so the cxxtests link DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
if test "$_debug_build" = yes; then
CXXFLAGS="$CXXFLAGS -fstack-protector"
else
CXXFLAGS="$CXXFLAGS -fno-stack-protector"
fi
CXXFLAGS="$CXXFLAGS -Wa,--noexecstack" CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
;; ;;
dc) dc)
INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc' INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc'
@ -3178,6 +3171,13 @@ fi
# #
case $_backend in case $_backend in
android) android)
# ssp at this point so the cxxtests link
if test "$_debug_build" = yes; then
CXXFLAGS="$CXXFLAGS -fstack-protector"
else
CXXFLAGS="$CXXFLAGS -fno-stack-protector"
fi
static_libs='' static_libs=''
system_libs='' system_libs=''
for lib in $LIBS; do for lib in $LIBS; do