diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-04-22 16:05:31 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-04-24 09:46:57 +0000 |
| commit | 77f8fc1aeffa30e5ba113dd18196ed1c8c61f05b (patch) | |
| tree | c82d7324775d4049dda4f5418031ba6b66d31da3 /share/qbs/modules | |
| parent | 96077ff2cccbe599623d05cb41dcd8285af39a59 (diff) | |
NDK r+19 doesn't need gcc-toolchain anymore
Change-Id: Ibe91183e1944365f10e64c104187167a6310d1fd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
| -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 164dd4834..23b50b14e 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -212,7 +212,7 @@ LinuxGCC { NdkUtils.getBinutilsPath(Android.ndk, toolchainTriple + "-"), "prebuilt", Android.ndk.hostArch, "bin"); binutilsPathPrefix: Gcc.pathPrefix(binutilsPath, toolchainTriple + "-") - driverFlags: qbs.toolchain.contains("clang") + driverFlags: qbs.toolchain.contains("clang") && Utilities.versionCompare(Android.ndk.version, "19") < 0 ? ["-gcc-toolchain", FileInfo.path(binutilsPath)].concat(base || []) : base syslibroot: FileInfo.joinPaths(Android.ndk.ndkDir, "platforms", Android.ndk.platform, "arch-" |