diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-22 15:51:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-14 11:44:51 +0000 |
| commit | 18a3b64ab07ade6bfc9bb068956beed2032d9b58 (patch) | |
| tree | 7bcb18c36f05508457074d783197cdd3f37f9fd6 /share/qbs/modules/cpp/GenericGCC.qbs | |
| parent | 5320c8578b600081d9c5174f4024b726c5bdefa0 (diff) | |
C++: Add support for clang on Windows
This is about clang in "mingw mode", not clang-cl.
When targeting Windows, clang is a lot like mingw, so factor out the
common parts into a new base module.
Testing uncovered a number of invalid assumptions in our autotests,
which are also fixed in this patch. In addition, minor adjustments had
to be made to the Qt.core module and to the qbscore lib.
Change-Id: I73085dc62a65e2a9d0397cf234c8641989246f22
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index f9537884e..3b775c9fa 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -135,14 +135,14 @@ CppModule { : undefined property string binutilsPath: binutilsProbe.found ? binutilsProbe.path : toolchainInstallPath - assemblerName: 'as' + assemblerName: 'as' + compilerExtension compilerName: cxxCompilerName - linkerName: 'ld' - property string archiverName: 'ar' - property string nmName: 'nm' - property string objcopyName: "objcopy" - property string stripName: "strip" - property string dsymutilName: "dsymutil" + linkerName: 'ld' + compilerExtension + property string archiverName: 'ar' + compilerExtension + property string nmName: 'nm' + compilerExtension + property string objcopyName: "objcopy" + compilerExtension + property string stripName: "strip" + compilerExtension + property string dsymutilName: "dsymutil" + compilerExtension property string lipoName property string sysroot: qbs.sysroot property string syslibroot: sysroot @@ -429,7 +429,7 @@ CppModule { + PathTools.bundleExecutableFilePath(product) } }]; - if (product.qbs.toolchain.contains("mingw")) { + if (product.cpp.imageFormat === "pe") { artifacts.push({ fileTags: ["dynamiclibrary_import"], filePath: FileInfo.joinPaths(product.destinationDirectory, |