diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-03 13:28:46 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-03 13:47:20 +0000 |
| commit | c158ed407067526ba74471c6e6bbf2b66eddecc7 (patch) | |
| tree | c9f7ca6626624d4441c75f9c43665e8f69b857ea /share | |
| parent | 2e830e5e4fdafed981bb5d95cd0327d572b7a402 (diff) | |
MSVC: Fix handling of intermediate objects
Amends 2e830e5e4f.
Change-Id: Ifecc822412c481d45121fa7d792e1fb2aa4e2064
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 2e2c28c49..1864c40e1 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -188,7 +188,8 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli if (product.cpp.debugInformation && product.cpp.separateDebugInformation) args.push("/Fd" + product.targetName + ".cl" + product.cpp.debugInfoSuffix); - var objOutput = outputs.obj ? outputs.obj[0] : undefined + var objectMap = outputs.obj || outputs.intermediate_obj + var objOutput = objectMap ? objectMap[0] : undefined args.push('/Fo' + FileInfo.toWindowsSeparators(objOutput.filePath)) args.push(FileInfo.toWindowsSeparators(input.filePath)) |