diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-06-17 16:05:58 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-06-17 14:11:14 +0000 |
| commit | e0ac40e53c5fc16b675ea2ac63fb5f3a6cab3dee (patch) | |
| tree | fe2dc7fd7adbc53f07a79dfb73e93962268bef89 /share | |
| parent | ec47b2d46df1490fa84c373e6ca5bf9eaf0d47dd (diff) | |
Android: Fix build with NDKr20
In NDK r20 clang adds -lc++ library automatically which leads to link fails.
Change-Id: Ifa5ae1f4be7d8a93146ef08a5dc312596dd19147
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 7642b246a..ad55d8191 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -101,7 +101,7 @@ LinuxGCC { linkerFlags: NdkUtils.commonLinkerFlags(Android.ndk.abi); driverLinkerFlags: { - var flags = ["-fuse-ld=lld", "-Wl,--exclude-libs,libgcc.a", "-Wl,--exclude-libs,libatomic.a"]; + var flags = ["-fuse-ld=lld", "-Wl,--exclude-libs,libgcc.a", "-Wl,--exclude-libs,libatomic.a", "-nostdlib++"]; if (Android.ndk.appStl.startsWith("c++") && Android.ndk.abi === "armeabi-v7a") flags = flags.concat(["-Wl,--exclude-libs,libunwind.a"]); return flags; |