aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-08-15 12:17:47 -0700
committerJake Petroules <jake.petroules@qt.io>2017-08-29 09:08:55 +0000
commit3e43b91396876b49cca8e0f80511cae426b02cf3 (patch)
tree549b3af409dc7682909cb5d8fadaaefff9b9aad8 /share
parent0f647796788494947632c0874931e4d84bccad46 (diff)
cpp module: fix detection of ARMv8 (32-bit) architecture
qbs.architecture is now set to "armv8" instead of "arm" for this architecture. Change-Id: I6d33e9c34ae8e617d6d194981f6051b3a09f643a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/imports/qbs/ModUtils/utils.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 50715f126..862d22a97 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -520,7 +520,7 @@ function guessArchitecture(m) {
architecture = "arm";
var foundSubarch = false;
- for (var i = 7; i >= 4; --i) {
+ for (var i = 8; i >= 4; --i) {
var codes = ["zk", "tej", "te", "t2"].concat([].concat.apply([],
new Array(26)).map(function(_, i) { return String.fromCharCode(122 - i); }));
for (var j = 0; j < codes.length; ++j) {