diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-06-13 09:38:48 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-06-13 07:14:54 +0000 |
| commit | 067664531853a1e857c777c1cc56fc64b272e021 (patch) | |
| tree | 04ac087f26ec962258e97398cff2140d691702f8 /mkspecs | |
| parent | 2e064637125b1604f7fcd4e6528c43a43487e471 (diff) | |
| download | qtbase-067664531853a1e857c777c1cc56fc64b272e021.tar.gz | |
Android: Fix build with NDKr20
In NDK r20 clang adds -lc++ library automatically which leads to link fails.
[ChangeLog][Android] Fix NDK r20 linking.
Task-number: QTBUG-76293
Change-Id: I6675180a3555d1ad9047d7a9ce1c03333cf0ab35
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index a077c70cba..975d43779d 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -31,7 +31,7 @@ else: equals(ANDROID_TARGET_ARCH, mips64): \ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info -QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a +QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ |