diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-04-22 14:12:16 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-04-24 09:46:36 +0000 |
| commit | 96077ff2cccbe599623d05cb41dcd8285af39a59 (patch) | |
| tree | 95f65a519fb7ff84c7906b0ab799e45c38c67431 /share/qbs/modules | |
| parent | 21968aed886e45c0514a2b770bc678c07a204d89 (diff) | |
Android: follow official android flags for cmake
Update our cflags and lflags with the ones found in <ndk_r19>/build/
cmake/android.toolchain.cmake
Task-number: QTBUG-73274
Change-Id: Ieb1923ffa6658fa917f7ead1e1bc036cf595f8bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 7079d95b4..164dd4834 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -131,7 +131,15 @@ LinuxGCC { commonCompilerFlags: NdkUtils.commonCompilerFlags(qbs.toolchain, qbs.buildVariant, Android.ndk.abi, Android.ndk.armMode) - linkerFlags: NdkUtils.commonLinkerFlags(Android.ndk.abi) + linkerFlags: { + var flags = NdkUtils.commonLinkerFlags(Android.ndk.abi); + if (qbs.toolchainType === "clang") { + flags = flags.concat(["--exclude-libs", "libgcc.a", "--exclude-libs", "libatomic.a"]); + if (Android.ndk.appStl.startsWith("c++") && Android.ndk.abi === "armeabi-v7a") + flags = flags.concat(["--exclude-libs", "libunwind.a"]); + } + return flags; + } platformDriverFlags: ["-no-canonical-prefixes"] @@ -151,7 +159,10 @@ LinuxGCC { return libs; } staticLibraries: { - var libs = ["gcc"]; + var libs = []; + if (qbs.toolchainType === "gcc") + libs.push("gcc"); + if (staticStlFilePath) { libs.push(staticStlFilePath); if (Android.ndk.appStl === "c++_static") { |