aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-07-16 14:23:13 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-07-16 13:15:57 +0000
commit8ddbe6531b1273f634505a56a7de34830faada06 (patch)
treee20f218631e62e6c68f6d8053f44639de3eda358 /share
parentf13ba2d0e3c8015649e874c8f643f6a19debf448 (diff)
Android: Fix binutils path
Amends 65cb0d3e2d. Fixes: QBS-1459 Change-Id: I771cc179bcc996559d76c85d785780a1b044812b Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/android-gcc.qbs2
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 ad55d8191..3e44f4ff3 100644
--- a/share/qbs/modules/cpp/android-gcc.qbs
+++ b/share/qbs/modules/cpp/android-gcc.qbs
@@ -147,7 +147,7 @@ LinuxGCC {
binutilsPath: FileInfo.joinPaths(Android.ndk.ndkDir, "toolchains", "llvm", "prebuilt",
Android.ndk.hostArch, "bin");
- binutilsPathPrefix: "llvm-"
+ binutilsPathPrefix: FileInfo.joinPaths(binutilsPath, "llvm-")
syslibroot: FileInfo.joinPaths(Android.ndk.ndkDir, "platforms",
Android.ndk.platform, "arch-"
+ NdkUtils.abiNameToDirName(Android.ndk.abi))