From eccc5676516f2ee22884cd9cbf15e6dba76fc632 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 12 Oct 2015 16:27:54 +0300 Subject: [PATCH] ProjectExplorer: Support ABI triplet of cygwin (x86_64-pc-cygwin) Change-Id: Idd0cc7986e0e6ba8185b32f3bb69a9c9cbf3ffe0 Reviewed-by: Tobias Hunger --- 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 3842f7fb32b..10f4ba52bc5 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -513,7 +513,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) flavor = Abi::FreeBsdFlavor; format = Abi::ElfFormat; } else if (p == QLatin1String("mingw32") || p == QLatin1String("win32") - || p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")) { + || p == QLatin1String("mingw32msvc") || p == QLatin1String("msys") + || p == QLatin1String("cygwin")) { arch = Abi::X86Architecture; os = Abi::WindowsOS; flavor = Abi::WindowsMSysFlavor; @@ -1082,6 +1083,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::PEFormat) << 64; + QTest::newRow("x86_64-pc-cygwin") << 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;