aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-01-14 22:34:11 -0600
committerColin Snover2017-01-14 22:39:28 -0600
commitee04b63d96895100ea27ce0f8b174a696b2c0779 (patch)
treebbf916f8340550cc6dd43d0e5716ee82f501b902
parent290bd977a2a05998fd575836a15b8f014dcd91a7 (diff)
downloadscummvm-rg350-ee04b63d96895100ea27ce0f8b174a696b2c0779.tar.gz
scummvm-rg350-ee04b63d96895100ea27ce0f8b174a696b2c0779.tar.bz2
scummvm-rg350-ee04b63d96895100ea27ce0f8b174a696b2c0779.zip
BUILD: Attempt to fix Android builds when building the test runner
Android builds currently fail when building the test runner because the runner tries to include standard library headers, which cannot be found. This patch adds the gcc-stdlibc++ include directory that matches the existing gcc-stdlibc++ linker flag.
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index b8656b1022..9634b3ac57 100755
--- a/configure
+++ b/configure
@@ -2358,6 +2358,7 @@ 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 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"