From 023e17009eea422ec2da8e3dfba447f3e7b5b75e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 12 Aug 2014 10:19:44 +0200
Subject: [PATCH] QbsProjectManager: Fix linker name for MSVC.

As opposed to gcc, we can't just invoke the compiler binary for linking.

Task-number: QTCREATORBUG-12824
Change-Id: Icdf8b7217b14976a7a4249b5d0c5cc5f76ffdd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 5250bee02e8..605100e06c8 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -163,7 +163,10 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
         if (!toolchainPrefix.isEmpty())
             data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
         data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
-        data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
+        if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS
+                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
+            data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
+        }
         data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
         if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
             const QLatin1String flags("/FS");