diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-04 12:36:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-06 14:46:13 +0100 |
commit | b4b02fe87679d5fdcaa8b3f6f35f65c9c13b5ee3 (patch) | |
tree | f21481aaa5df4fb17ac0787392e0a06bdad35856 /qmake/generators/win32/msvc_nmake.cpp | |
parent | bff38599d9678eff20499a6b592055710710794f (diff) |
MSVC: don't use the variable name LINK in generated makefiles
Rename LINK to LINKER. The MSVC linker uses the environment
variable LINK to pass additional command line arguments.
We must not hide this variable.
Task-number: QTBUG-28332
Change-Id: Id78476d1cf4a73175b9f47292c67f38a43ae5ba4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index d982d8bcf0..3fed7b4b7b 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -462,7 +462,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) void NmakeMakefileGenerator::writeLinkCommand(QTextStream &t, const QString &extraFlags, const QString &extraInlineFileContent) { - t << "$(LINK) $(LFLAGS)"; + t << "$(LINKER) $(LFLAGS)"; if (!extraFlags.isEmpty()) t << ' ' << extraFlags; t << " /OUT:$(DESTDIR_TARGET) @<<\n" |