diff options
| author | Thomas Epting <thomas.epting@stryker.com> | 2016-10-04 09:15:12 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-06 19:39:38 +0000 |
| commit | efd0607b818d7c35ed668a8d7c0b0b7b2da7558d (patch) | |
| tree | 0c90b35994035b994a6ff4953e1917ec0384638e | |
| parent | ed69ed958d6ca25cb97dc81b21322f8ab398b7df (diff) | |
Cleanup remaining qbs_dummy files on detection of the MSVC environment
Task-number: QBS-1024
Change-Id: I2ec6b941d77bc769d119f30cac5b0f621db8930f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/tools/msvcinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 0ea4e11f2..044f864d2 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -151,6 +151,9 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath, } DummyFile actualDummyFile(actualDummyFilePath); const QString qbsClFrontend = nativeDummyFilePath + QStringLiteral(".exe"); + const QString qbsClFrontendObj = nativeDummyFilePath + QStringLiteral(".obj"); + DummyFile actualQbsClFrontend(qbsClFrontend); + DummyFile actualQbsClFrontendObj(qbsClFrontendObj); // The host compiler is the x86 compiler, which will execute on any edition of Windows // for which host compilers have been released so far (x86, x86_64, ia64) @@ -162,6 +165,7 @@ static QVariantMap getMsvcDefines(const QString &hostCompilerFilePath, runProcess(hostCompilerFilePath, QStringList() << QStringLiteral("/nologo") << QStringLiteral("/TC") + << (QStringLiteral("/Fo") + qbsClFrontendObj) << nativeDummyFilePath << QStringLiteral("/link") << (QStringLiteral("/out:") + qbsClFrontend), msvc2.environments[QString()]); |