diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-10 16:34:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-14 18:49:56 +0000 |
| commit | a23568be6c6859b3a149cfadb1104da4f32318f5 (patch) | |
| tree | af8852b772c913e66e49bd3fdcf9f23b4173509e /mkspecs | |
| parent | 4db3a5f8ebc8031da12d903807a7b2857e28276a (diff) | |
Fix CONFIG+=silent for MSVC non-inference rules
silent.prf modifies the compiler commands by prefixing them with a
silencing echo command. For MSVC, the used $< syntax is only valid in
inference rules. However, the PCH rule is not an inference
rule and breaks when silent.prf is used.
Remove the echo command for MSVC. The compiler already outputs the
currently compiled file. There's no need to do it twice.
Task-number: QTBUG-61688
Change-Id: I7e2c1211e471c9c149c16cac8e87406e88ee2d97
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/silent.prf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/silent.prf b/mkspecs/features/silent.prf index 141e6bf9e4..6d7c170419 100644 --- a/mkspecs/features/silent.prf +++ b/mkspecs/features/silent.prf @@ -1,6 +1,11 @@ !macx-xcode { - QMAKE_CC = @echo compiling $< && $$QMAKE_CC - QMAKE_CXX = @echo compiling $< && $$QMAKE_CXX + msvc { + QMAKE_CC = @$$QMAKE_CC + QMAKE_CXX = @$$QMAKE_CXX + } else { + QMAKE_CC = @echo compiling $< && $$QMAKE_CC + QMAKE_CXX = @echo compiling $< && $$QMAKE_CXX + } !contains(QMAKE_LINK, "@:"):QMAKE_LINK = @echo linking $@ && $$QMAKE_LINK QMAKE_LINK_SHLIB = @echo linking $@ && $$QMAKE_LINK_SHLIB } |