1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC Makefiles when SOURCES is empty

Browse Source 
Call sites of NmakeMakefileGenerator::writeResponseFileFiles expect that
the output is terminated with '\n'. Do not bail out if files is empty.

Task-number: QTBUG-59305
Change-Id: Id3fef8dbc506dad1868e6b352119f5f27b50a368
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Joerg Bornemann 2017-03-06 12:46:28 +01:00
parent 58cc126def
commit a12a3c6c8c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/msvc_nmake.cpp
View File

@ -662,8 +662,6 @@ void NmakeMakefileGenerator::writeLinkCommand(QTextStream &t, const QString &ext
void NmakeMakefileGenerator::writeResponseFileFiles(QTextStream &t, const ProStringList &files) void NmakeMakefileGenerator::writeResponseFileFiles(QTextStream &t, const ProStringList &files)
{ {
if (files.isEmpty())
return;
// Add line breaks in file lists in reponse files to work around LNK1170. // Add line breaks in file lists in reponse files to work around LNK1170.
// The actual line length limit is 131070, but let's use a smaller limit // The actual line length limit is 131070, but let's use a smaller limit
// in case other tools are similarly hampered. // in case other tools are similarly hampered.