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/Makefile.win32 | |
| 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/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index f560cf8cb1..222acfa9a6 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -14,11 +14,11 @@ QMKSRC = $(SOURCE_PATH)\qmake # !if "$(QMAKESPEC)" == "win32-icc" CXX = icl -LINK = link +LINKER = link CFLAGS = /Zc:forScope !else CXX = cl -LINK = link +LINKER = link !endif # @@ -49,7 +49,7 @@ CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = ole32.lib advapi32.lib -LINKQMAKE = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS) +LINKQMAKE = $(LINKER) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = vc60.pdb vc70.pdb qmake.pdb qmake.ilk !ELSE |