diff options
| author | dhewg | 2011-06-15 19:09:50 +0200 |
|---|---|---|
| committer | dhewg | 2011-06-15 19:09:50 +0200 |
| commit | b97a5dcfb2e71d358274e017e4f1fdca02db4fa7 (patch) | |
| tree | 85cabefc26cfb9c4d7452ae8c71e2e40c8aec6fa /configure | |
| parent | 624042eedd0f2e86308173c995e9760b4cd8de3f (diff) | |
| download | scummvm-rg350-b97a5dcfb2e71d358274e017e4f1fdca02db4fa7.tar.gz scummvm-rg350-b97a5dcfb2e71d358274e017e4f1fdca02db4fa7.tar.bz2 scummvm-rg350-b97a5dcfb2e71d358274e017e4f1fdca02db4fa7.zip | |
CONFIGURE: Fix cxx test linking for Android
Libraries are now properly detected by configure again.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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 |