aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-08-23 08:27:26 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-08-29 15:02:42 +0000
commit2618e3cc308598be7799bf31bc8d08d9115c6e43 (patch)
tree803f66c73ee9cc54c12b06dd575de1275212b690 /share
parent7ddbc5997e123c60c45865bae2df380174caf72c (diff)
MSVC: Suppress "performing full link" also for executables
Change-Id: Ibf544198b23021361d90b3d3c1cdbbbb0651453b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/msvc.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 196e5ae43..698f44398 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -475,7 +475,8 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
cmd.workingDirectory = FileInfo.path(primaryOutput.filePath)
cmd.responseFileUsagePrefix = '@';
cmd.stdoutFilterFunction = function(output) {
- return output.replace(/^(.*performing full link.*\r\n)? +Creating library.*\r\n$/, "");
+ res = output.replace(/^.*performing full link.*\s*/, "");
+ return res.replace(/^ *Creating library.*\r\n$/, "");
};
commands.push(cmd);