diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-22 09:36:31 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2020-07-06 13:40:45 +0000 |
| commit | cd75446c1e6e9ce17f9bb536af97775ad62aef1a (patch) | |
| tree | 931942dca1a3af38d8d5ff389151ccc78b5af9ef /qmake/generators/unix/unixmake2.cpp | |
| parent | 96cea3b1681dd24a0ec3a53078b78f902e3211a6 (diff) | |
Makefile: Deduplicate logic for response file name
+ verify that the file was actually written.
Change-Id: I14a3c0b75f41f926b469109a1d7f2f80368ec9bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index e907114ac0..48352c0c47 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1554,13 +1554,8 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t, if (objMax.isEmpty() || project->values("OBJECTS").count() < objMax.toInt()) { objectsLinkLine = "$(OBJECTS)"; } else { - QString ld_response_file = fileVar("OBJECTS_DIR"); - ld_response_file += var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("QMAKE_TARGET"); - if (!var("BUILD_NAME").isEmpty()) - ld_response_file += "." + var("BUILD_NAME"); - if (!var("MAKEFILE").isEmpty()) - ld_response_file += "." + var("MAKEFILE"); - createResponseFile(ld_response_file, objs); + const QString ld_response_file = createResponseFile( + fileVar("OBJECTS_DIR") + var("QMAKE_LINK_OBJECT_SCRIPT"), objs); objectsLinkLine = "@" + escapeFilePath(ld_response_file); } t << "OBJECTS = " << valList(escapeDependencyPaths(objs)) << Qt::endl; |