From 3b87ecc06a4056de48ce7fa4d69ca71422cc1170 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Mon, 11 Feb 2019 20:39:36 +0800 Subject: [PATCH] Win32 makefile for qmake: Use proper linker Use xilink for ICC and lld-link for Clang. Change-Id: I13c74339ae9e3e5c97210afd20a53c7e474b873b Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- qmake/Makefile.win32 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index ed738e0c02..3f13df884a 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -12,11 +12,11 @@ QMKSRC = $(SOURCE_PATH)\qmake # !if "$(QMAKESPEC)" == "win32-icc" CXX = icl -LINKER = link +LINKER = xilink CFLAGS_EXTRA = /Zc:forScope /Qstd=c++11 !elseif "$(QMAKESPEC)" == "win32-clang-msvc" CXX = clang-cl -LINKER = link +LINKER = lld-link CFLAGS_EXTRA = -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-value !else CXX = cl