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

configure: set ltcg only for Qt modules

Browse Source 
Adding ltcg to qconfig.pri enables ltcg
unconditionally for everyone using msvc.

Change-Id: Ie1d11612a10fcdcb27de41664141e661a17323dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Peter Kümmel 2015-10-31 17:23:23 +01:00
parent 6c84f48da8
commit 7c19b28c58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configure/configureapp.cpp
View File

@ -3136,7 +3136,7 @@ void Configure::generateOutputVars()
void Configure::generateCachefile() void Configure::generateCachefile()
{ {
// Generate qmodule.pri // Generate qmodule.pri, which is loaded only by Qt modules
{ {
FileWriter moduleStream(buildPath + "/mkspecs/qmodule.pri"); FileWriter moduleStream(buildPath + "/mkspecs/qmodule.pri");
@ -3204,6 +3204,8 @@ void Configure::generateCachefile()
moduleStream << " largefile"; moduleStream << " largefile";
if (dictionary[ "STRIP" ] == "no") if (dictionary[ "STRIP" ] == "no")
moduleStream << " nostrip"; moduleStream << " nostrip";
if (dictionary[ "LTCG" ] == "yes")
moduleStream << " ltcg";
moduleStream << endl; moduleStream << endl;
for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var)
@ -3491,8 +3493,6 @@ void Configure::generateQConfigPri()
if (dictionary["STATIC_RUNTIME"] == "yes") if (dictionary["STATIC_RUNTIME"] == "yes")
configStream << " static_runtime"; configStream << " static_runtime";
if (dictionary[ "LTCG" ] == "yes")
configStream << " ltcg";
if (dictionary[ "RTTI" ] == "yes") if (dictionary[ "RTTI" ] == "yes")
configStream << " rtti"; configStream << " rtti";
if (dictionary["INCREDIBUILD_XGE"] == "yes") if (dictionary["INCREDIBUILD_XGE"] == "yes")