From 53e1c84f50f62d0509704f3d9f3719e56555c237 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 13 Aug 2015 16:36:11 +0300 Subject: [PATCH] ProjectExplorer: Support ABI triplet of MSYS2 (x86_64-pc-msys) Change-Id: If041b729d621a3119d84d2978b6d9adce2e4034b Reviewed-by: Eike Ziller Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/abi.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index e5c79f20e9..3842f7fb32 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -512,7 +512,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) if (flavor == Abi::UnknownFlavor) flavor = Abi::FreeBsdFlavor; format = Abi::ElfFormat; - } else if (p == QLatin1String("mingw32") || p == QLatin1String("win32") || p == QLatin1String("mingw32msvc")) { + } else if (p == QLatin1String("mingw32") || p == QLatin1String("win32") + || p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")) { arch = Abi::X86Architecture; os = Abi::WindowsOS; flavor = Abi::WindowsMSysFlavor; @@ -1077,6 +1078,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::PEFormat) << 0; + QTest::newRow("x86_64-pc-msys") << int(Abi::X86Architecture) + << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) + << int(Abi::PEFormat) << 64; + QTest::newRow("mingw32") << int(Abi::X86Architecture) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::PEFormat) << 0; -- GitLab