diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-12 10:19:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-12 17:49:20 +0200 |
| commit | 023e17009eea422ec2da8e3dfba447f3e7b5b75e (patch) | |
| tree | f7d9c9eb08c8ede23625849e16228a854ae39e9b /src/plugins/qbsprojectmanager | |
| parent | 7b6efde141a233cb9c8de9a3a4ee5ddb3a2cefa5 (diff) | |
| download | qt-creator-023e17009eea422ec2da8e3dfba447f3e7b5b75e.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
| -rw-r--r-- | src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 5250bee02e..605100e06c 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"); |