mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-29 14:42:26 +00:00
CONFIGURE: Fix cxx test linking for Android
Libraries are now properly detected by configure again.
This commit is contained in:
parent
624042eedd
commit
b97a5dcfb2
16
configure
vendored
16
configure
vendored
@ -2208,16 +2208,9 @@ fi
|
||||
#
|
||||
case $_backend in
|
||||
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
|
||||
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
|
||||
CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
|
||||
LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
|
||||
|
||||
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
|
||||
;;
|
||||
dc)
|
||||
INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc'
|
||||
@ -3178,6 +3171,13 @@ fi
|
||||
#
|
||||
case $_backend in
|
||||
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=''
|
||||
system_libs=''
|
||||
for lib in $LIBS; do
|
||||
|
Loading…
x
Reference in New Issue
Block a user