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/win32 | |
| 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/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 2ffcff9a3c..eb100764ae 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -231,25 +231,16 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t) if (objmax.isEmpty() || project->values("OBJECTS").count() < objmax.toInt()) { objectsLinkLine = "$(OBJECTS)"; } else if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") { - QString ar_response_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET"); - if (!var("BUILD_NAME").isEmpty()) { - ar_response_file += "." + var("BUILD_NAME"); - } - if (!var("MAKEFILE").isEmpty()) - ar_response_file += "." + var("MAKEFILE"); // QMAKE_LIB is used for win32, including mingw, whereas QMAKE_AR is used on Unix. QString ar_cmd = var("QMAKE_LIB"); if (ar_cmd.isEmpty()) ar_cmd = "ar -rc"; - createResponseFile(ar_response_file, project->values("OBJECTS")); + const QString ar_response_file = + createResponseFile(var("QMAKE_LINK_OBJECT_SCRIPT"), project->values("OBJECTS")); objectsLinkLine = ar_cmd + ' ' + var("DEST_TARGET") + " @" + escapeFilePath(ar_response_file); } else { - QString ld_response_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("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, project->values("OBJECTS")); + const QString ld_response_file = + createResponseFile(var("QMAKE_LINK_OBJECT_SCRIPT"), project->values("OBJECTS")); objectsLinkLine = "@" + escapeFilePath(ld_response_file); } Win32MakefileGenerator::writeObjectsPart(t); |