diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-04-06 14:04:11 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-04-28 06:32:59 +0000 |
| commit | 85c09f3c518c3dcd3ba3503adb9ae9a0eab34253 (patch) | |
| tree | a89f46b21086ba175bc63cca9cbe5ecb208e532a /qmake | |
| parent | c068edcecf6876c7b57abbe302ad8b1347e4445e (diff) | |
Use QMAKE_TARGET for the name of the object script file
Since TARGET at this point contains the path to where the target will
be then it can include ".." as part of it which will cause problems when
building for Android on Windows. Therefore, QMAKE_TARGET should be used
as an identifier here as the path is not needed.
Change-Id: Idb8babd0459c65cbcfd64fe47baeac4303a3fd87
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 9789c9c8e5..0412b52813 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1560,7 +1560,7 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t, objectsLinkLine = "$(OBJECTS)"; } else { QString ld_response_file = fileVar("OBJECTS_DIR"); - ld_response_file += var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET"); + 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()) |