Commit 53e1c84f authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

ProjectExplorer: Support ABI triplet of MSYS2 (x86_64-pc-msys)

Change-Id: If041b729d621a3119d84d2978b6d9adce2e4034b
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent 1f445f8f
...@@ -512,7 +512,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) ...@@ -512,7 +512,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
if (flavor == Abi::UnknownFlavor) if (flavor == Abi::UnknownFlavor)
flavor = Abi::FreeBsdFlavor; flavor = Abi::FreeBsdFlavor;
format = Abi::ElfFormat; 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; arch = Abi::X86Architecture;
os = Abi::WindowsOS; os = Abi::WindowsOS;
flavor = Abi::WindowsMSysFlavor; flavor = Abi::WindowsMSysFlavor;
...@@ -1077,6 +1078,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() ...@@ -1077,6 +1078,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 0; << 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) QTest::newRow("mingw32") << int(Abi::X86Architecture)
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 0; << int(Abi::PEFormat) << 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment