diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-07-28 16:52:31 +0300 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2017-08-23 12:47:58 +0000 |
| commit | 09ea013ae17caad7d973fb05287a634dba2768c9 (patch) | |
| tree | 4be46f69a069c1da87b1f998f828dcf2581312e0 /mkspecs/android-g++/qmake.conf | |
| parent | 2740584e6de5ec2999e0e44f363bc18b9252dc23 (diff) | |
Use libc++ instead of libstdc++ when compiling with android-clang mkspec
clang+libc++ is the only supported way by Google nowadays.
libstdc++ is too old and already fails to build some C++11 apps
e.g. missing std::to_string().
android-g++ mkspec still uses libstdc++ and g++.
Use -isystem to include system headers instead of QMAKE_INCDIR_POST (-I).
Task-number: QTBUG-60455
Change-Id: Iba8b04594c2e5e2832e6cf480e4e52ff31ad4106
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs/android-g++/qmake.conf')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 2b81ac58f0..5e8a97c9d7 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -10,9 +10,24 @@ include(../common/gcc-base-unix.conf) include(../common/android-base-head.conf) QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc -QMAKE_CXX = $$QMAKE_GCC +QMAKE_CXX = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-g++ +QMAKE_LINK = $$QMAKE_CXX -QMAKE_CFLAGS = -QMAKE_LINK = $$QMAKE_GCC +ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ARCH +ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libgnustl_shared.so +ANDROID_CXX_STL_LIBS = -lgnustl_shared -lgcc + +QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ + -isystem $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include \ + -isystem $$ANDROID_SOURCES_CXX_STL_LIBDIR/include + +equals(ANDROID_TARGET_ARCH, armeabi)|equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ + LIBGCC_PATH_FULL = $$system("$$QMAKE_CXX -mthumb-interwork -print-libgcc-file-name") +else: \ + LIBGCC_PATH_FULL = $$system("$$QMAKE_CXX -print-libgcc-file-name") +ANDROID_SOURCES_CXX_STL_LIBDIR += $$dirname(LIBGCC_PATH_FULL) + +QMAKE_ARM_CFLAGS_RELEASE = -Os +QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -Os include(../common/android-base-tail.conf) |