diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-18 02:19:35 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-18 11:14:43 +0300 |
| commit | 6d9cc029235e7fb686923f8bdc75c94ad2d15b55 (patch) | |
| tree | c9fc36cb5e0c9d279208b2aa82a40904f233ccdb /tests/auto/blackbox | |
| parent | a6a15d0ef9d2a91af23221cabdbe454225631e09 (diff) | |
| parent | 610508fcbf95b16567a17f53fd370f9b0ae3505b (diff) | |
Merge branch '2.0' into master
Change-Id: I3ee32bc62c313a525fe46949a4d99f97bf2d8946
Diffstat (limited to 'tests/auto/blackbox')
| -rw-r--r-- | tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs index ec46938ab..c138e46c0 100644 --- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs +++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs @@ -33,6 +33,7 @@ Project { property string dummy: product.linkWholeArchive // To force probe re-execution configure: { if (!toolchain.includes("msvc") + || toolchain.includes("clang-cl") || Utilities.versionCompare(compilerVersion, "19.0.24215.1") >= 0) { console.info("can link whole archives"); } else { |