summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-08-26 04:15:30 -0700
committerJake Petroules <jake.petroules@petroules.com>2015-08-26 18:09:18 +0000
commitd1c307a08400f63afccd9d2baeb53c665579c3b7 (patch)
tree71acc95c9c04f36477c0599062f5ec2ed04d7c67
parentd170bb9a8902cdd56c966c8a56da66cbd5d7cf52 (diff)
downloadqbs-d1c307a08400f63afccd9d2baeb53c665579c3b7.tar.gz
Fix 'gcc.exe is not a standard compiler file name' message on Windows.
Change-Id: Ic526342ba837a92dfee0f79ee37c0d8c586c200e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--src/app/qbs-setup-toolchains/probe.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 79478f02b..303dd7436 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -122,8 +122,11 @@ static QString gccMachineName(const QString &compilerFilePath)
static QStringList standardCompilerFileNames()
{
- return QStringList() << QStringLiteral("gcc") << QStringLiteral("g++")
- << QStringLiteral("clang") << QStringLiteral("clang++");
+ return QStringList()
+ << HostOsInfo::appendExecutableSuffix(QStringLiteral("gcc"))
+ << HostOsInfo::appendExecutableSuffix(QStringLiteral("g++"))
+ << HostOsInfo::appendExecutableSuffix(QStringLiteral("clang"))
+ << HostOsInfo::appendExecutableSuffix(QStringLiteral("clang++"));
}
static void setCommonProperties(Profile &profile, const QString &compilerFilePath,