36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 43bba0798fb7367a67a7802832012d1a6b1662bd Mon Sep 17 00:00:00 2001
|
|
From: BogDan Vatra <bogdan@kde.org>
|
|
Date: Thu, 13 Jun 2019 09:38:48 +0300
|
|
Subject: [PATCH 4/4] Android: Fix build with NDKr20
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
mkspecs/android-clang/qmake.conf | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf
|
|
index d448291fe8..8f145a2bb7 100644
|
|
--- a/mkspecs/android-clang/qmake.conf
|
|
+++ b/mkspecs/android-clang/qmake.conf
|
|
@@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \
|
|
|
|
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=$$ANDROID_PLATFORM_ROOT_PATH \
|
|
--
|
|
2.22.0
|
|
|