From cd75446c1e6e9ce17f9bb536af97775ad62aef1a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 22 Dec 2019 09:36:31 +0200 Subject: Makefile: Deduplicate logic for response file name + verify that the file was actually written. Change-Id: I14a3c0b75f41f926b469109a1d7f2f80368ec9bb Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake2.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'qmake/generators/unix') 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 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; -- cgit v1.2.3