diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-01-15 12:56:15 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-02-13 15:46:05 +0100 |
| commit | 2310d9dc65b4d69e04e4aaa4f393722b7fff653d (patch) | |
| tree | d8d715889266dc689a2c5c8321252ae657939d2a /qmake | |
| parent | 0091a50bbd1486b2ee1713ac2a63e4117f6ccd78 (diff) | |
| download | qtbase-2310d9dc65b4d69e04e4aaa4f393722b7fff653d.tar.gz | |
qmake: Allow the use of a response file when building a library
Change b274f656b82e06fad492e241dae6ae65cb377ad1 enabled the use of a
response file for application building specifically needed when building
an application for Android on Windows. The same cause can happen when
building a library too with a lot of object files, so the command for
the link step can be too long. So we expand the functionality to be
used for libraries too.
Task-number: QTBUG-71940
Change-Id: Ia6d1943bf33f6decb53f6e71a8dc65310d2f20a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 550fa9d834..91470fb129 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -558,6 +558,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << destdir_d << depVar("TARGET") << ": " << depVar("PRE_TARGETDEPS") << ' ' << incr_deps << " $(SUBLIBS) " << target_deps << ' ' << depVar("POST_TARGETDEPS"); } else { + ProStringList &cmd = project->values("QMAKE_LINK_SHLIB_CMD"); + cmd[0] = cmd.at(0).toQString().replace(QLatin1String("$(OBJECTS)"), objectParts.second); t << destdir_d << depVar("TARGET") << ": " << depVar("PRE_TARGETDEPS") << " $(OBJECTS) $(SUBLIBS) $(OBJCOMP) " << target_deps << ' ' << depVar("POST_TARGETDEPS"); |