| From 99b73c2d8964aa95fc439defa0588751f080cf90 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 5/6] setup-toolchains: Pretend msys is mingw |
| |
| It's close enough and the best we've got. |
| --- |
| src/app/qbs-setup-toolchains/gccprobe.cpp | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp |
| index 0ae9f6c..3d5e03c 100644 |
| --- a/src/app/qbs-setup-toolchains/gccprobe.cpp |
| +++ b/src/app/qbs-setup-toolchains/gccprobe.cpp |
| @@ -89,7 +89,9 @@ |
| QStringLiteral("i686-w64-mingw32.static"), |
| QStringLiteral("x86_64-w64-mingw32.static"), |
| QStringLiteral("i586-mingw32msvc"), |
| - QStringLiteral("amd64-mingw32msvc")}; |
| + QStringLiteral("amd64-mingw32msvc"), |
| + QStringLiteral("i686-pc-msys"), |
| + QStringLiteral("x86_64-pc-msys")}; |
| } |
| |
| static QString gccMachineName(const QFileInfo &compiler) |
| @@ -458,7 +460,7 @@ |
| { |
| const QString machineName = gccMachineName(compiler); |
| |
| - if (toolchainType == QLatin1String("mingw")) { |
| + if (toolchainType == QLatin1String("mingw") || toolchainType == QLatin1String("msys")) { |
| if (!validMinGWMachines().contains(machineName)) { |
| throw ErrorInfo(Tr::tr("Detected gcc platform '%1' is not supported.") |
| .arg(machineName)); |
| -- |
| 2.3.5 |
| |
