diff options
| author | Colin Snover | 2017-01-15 10:15:15 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-01-15 10:16:09 -0600 |
| commit | ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f (patch) | |
| tree | af87086ea90bae85d5e29df1563021f964af0653 /configure | |
| parent | d4ff8835306bc5c15c929ee799e53093bdde7757 (diff) | |
| download | scummvm-rg350-ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f.tar.gz scummvm-rg350-ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f.tar.bz2 scummvm-rg350-ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f.zip | |
BUILD: Attempt to fix Android builds of test runner
Mixing -I and -isystem for system headers causes failures.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2358,8 +2358,8 @@ case $_host_os in append_var LDFLAGS "-mthumb-interwork" fi - append_var CXXFLAGS "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/" - append_var CXXFLAGS "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/" + append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/" + append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/" append_var LDFLAGS "-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/" append_var LIBS "-lsupc++" add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK" @@ -3197,7 +3197,7 @@ case $_backend in append_var DEFINES "-DREDUCE_MEMORY_USAGE" append_var CXXFLAGS "-Wa,--noexecstack" append_var LDFLAGS "-Wl,-z,noexecstack" - append_var INCLUDES "-I$ANDROID_NDK/sources/cxx-stl/system/include" + append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/system/include" ;; androidsdl) ;; |