37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
From 77f364bcb243b4db85df023a50f5d8a986a5f570 Mon Sep 17 00:00:00 2001
|
|
From: Ray Donnelly <mingw.android@gmail.com>
|
|
Date: Sat, 29 Nov 2014 18:29:20 +0000
|
|
Subject: [PATCH 05/10] setup-toolchains: Pretend msys is mingw
|
|
|
|
It's close enough and the best we've got.
|
|
---
|
|
src/app/qbs-setup-toolchains/probe.cpp | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
|
|
index 531bbf0..c57bd67 100644
|
|
--- a/src/app/qbs-setup-toolchains/probe.cpp
|
|
+++ b/src/app/qbs-setup-toolchains/probe.cpp
|
|
@@ -89,7 +89,8 @@ static QStringList validMinGWMachines()
|
|
<< QLatin1String("i686-w64-mingw32") << QLatin1String("x86_64-w64-mingw32")
|
|
<< QLatin1String("i686-w64-mingw32.shared") << QLatin1String("x86_64-w64-mingw32.shared")
|
|
<< QLatin1String("i686-w64-mingw32.static") << QLatin1String("x86_64-w64-mingw32.static")
|
|
- << QLatin1String("i586-mingw32msvc") << QLatin1String("amd64-mingw32msvc");
|
|
+ << QLatin1String("i586-mingw32msvc") << QLatin1String("amd64-mingw32msvc")
|
|
+ << QLatin1String("i686-pc-msys") << QLatin1String("x86_64-pc-msys");
|
|
}
|
|
|
|
static QStringList completeToolchainList(const QString &toolchainName)
|
|
@@ -200,7 +201,7 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti
|
|
{
|
|
const QString machineName = gccMachineName(compilerFilePath);
|
|
const QStringList compilerTriplet = machineName.split(QLatin1Char('-'));
|
|
- const bool isMingw = toolchainTypes.contains(QLatin1String("mingw"));
|
|
+ const bool isMingw = toolchainTypes.contains(QLatin1String("mingw")) || toolchainTypes.contains(QLatin1String("msys"));
|
|
const bool isClang = toolchainTypes.contains(QLatin1String("clang"));
|
|
|
|
if (isMingw) {
|
|
--
|
|
2.3.5
|
|
|