diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 11:14:54 +0100 |
| commit | a9ac384513cc2c39b2005ee5651c34a49e801641 (patch) | |
| tree | 830bf2b3bad36fec9b9fa0fa76f9dfa488f22da4 /share/qbs/modules/cpp/android-gcc.qbs | |
| parent | 126ce8cd2b2c0c10525e23c9900ec25b0bade601 (diff) | |
| parent | 8815e0007006e996bc145a91970d71b9b4ae86d0 (diff) | |
Merge 1.10 into master
Change-Id: Iab942ed25d06038cf8c172eb70dcd8e9a720e1c8
Diffstat (limited to 'share/qbs/modules/cpp/android-gcc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 5c503a306..057e77476 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -72,7 +72,7 @@ LinuxGCC { property string stlLibsDir: { if (stlBaseDir) { var infix = Android.ndk.abi; - if (Android.ndk.armMode === "thumb") + if (Android.ndk.armMode === "thumb" && !Android.ndk.haveUnifiedStl) infix = FileInfo.joinPaths(infix, "thumb"); return FileInfo.joinPaths(stlBaseDir, "libs", infix); } @@ -286,6 +286,8 @@ LinuxGCC { } validate: { + if (!_skipAllChecks) + return; var baseValidator = new ModUtils.PropertyValidator("qbs"); baseValidator.addCustomValidator("architecture", targetArch, function (value) { return value !== undefined; |