Commit 58282054 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Abi: Detect also "windows" as OS

Clang reports x86-pc-windows-msvc

Change-Id: Ibaed516e6d63bc8d99298f72c862d7ac07ca37f9
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent d0823cd5
......@@ -545,7 +545,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
format = Abi::ElfFormat;
} else if (p == QLatin1String("mingw32") || p == QLatin1String("win32")
|| p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")
|| p == QLatin1String("cygwin")) {
|| p == QLatin1String("cygwin") || p == QLatin1String("windows")) {
arch = Abi::X86Architecture;
os = Abi::WindowsOS;
flavor = Abi::WindowsMSysFlavor;
......@@ -1133,6 +1133,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 64;
QTest::newRow("x86-pc-windows-msvc") << int(Abi::X86Architecture)
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 32;
QTest::newRow("mingw32") << int(Abi::X86Architecture)
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< 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