diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 12:41:35 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-18 10:47:51 +0000 |
| commit | 69218a9739306d0e8dc7ee1508381fe1cb7f1b74 (patch) | |
| tree | 3babcde238fad4a2f175b3277481990153939438 | |
| parent | 3eedf7598c322519c3a04374784bb2251e8982df (diff) | |
MSVC: Relax version check for /WHOLEARCHIVE
The flag is supported in earlier compiler versions than our code
assumed.
Change-Id: I5bc32c29c61885ca38e60bb8a000250a11d32b0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index e96b53d8f..8a2fc4d7a 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -320,7 +320,7 @@ function collectLibraryDependencies(product) { function linkerSupportsWholeArchive(product) { - return Utilities.versionCompare(product.cpp.compilerVersion, "19.0.25123") >= 0 + return Utilities.versionCompare(product.cpp.compilerVersion, "19.0.24215.1") >= 0 } function handleDiscardProperty(product, flags) { diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs index 855ab44d0..4ab93af28 100644 --- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs +++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs @@ -34,7 +34,7 @@ Project { property string dummy: product.linkWholeArchive // To force probe re-execution configure: { if (!toolchain.contains("msvc") - || Utilities.versionCompare(compilerVersion, "19.0.25123") >= 0) { + || Utilities.versionCompare(compilerVersion, "19.0.24215.1") >= 0) { console.info("can link whole archives"); } else { console.info("cannot link whole archives"); |