aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2023-05-11 18:21:08 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2023-05-12 08:01:53 +0000
commit9f4254a94eba886de6960351e8ca20e40622b4ee (patch)
treebd5d69c25b81ee365f4070c77f3a19f4637c7102 /share/qbs/modules
parent97c7f802ef065b6133fc075d1559ede4952bf872 (diff)
js_versionCompare: allow build number
It is not clear why it worked before. Task-number: QBS-1733 Change-Id: Ib870f669d9151c91635b7078fae8cb217c9955f3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
-rw-r--r--share/qbs/modules/cpp/msvc.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 8be4bff24..96e9839a2 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -371,7 +371,8 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli
function linkerSupportsWholeArchive(product)
{
- return Utilities.versionCompare(product.cpp.compilerVersion, "19.0.24215.1") >= 0
+ return product.qbs.toolchainType.includes("clang-cl") ||
+ Utilities.versionCompare(product.cpp.compilerVersion, "19.0.24215.1") >= 0
}
function handleDiscardProperty(product, flags) {