AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CONFIG+=silent for MSVC non-inference rules

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2017-07-10 16:34:50 +02:00
parent 4db3a5f8eb
commit a23568be6c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/features/silent.prf
View File

@ -1,6 +1,11 @@
!macx-xcode { !macx-xcode {
QMAKE_CC = @echo compiling $< && $$QMAKE_CC msvc {
QMAKE_CXX = @echo compiling $< && $$QMAKE_CXX 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 !contains(QMAKE_LINK, "@:"):QMAKE_LINK = @echo linking $@ && $$QMAKE_LINK
QMAKE_LINK_SHLIB = @echo linking $@ && $$QMAKE_LINK_SHLIB QMAKE_LINK_SHLIB = @echo linking $@ && $$QMAKE_LINK_SHLIB
} }