feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Abi: Detect also "windows" as OS

Browse Source 
Clang reports x86-pc-windows-msvc

Change-Id: Ibaed516e6d63bc8d99298f72c862d7ac07ca37f9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-04-06 16:22:24 +03:00
committed by Orgad Shaneh
parent d0823cd5e2
commit 5828205418
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/abi.cpp
View File

@@ -545,7 +545,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
format = Abi::ElfFormat; format = Abi::ElfFormat;
} else if (p == QLatin1String("mingw32") || p == QLatin1String("win32") } else if (p == QLatin1String("mingw32") || p == QLatin1String("win32")
|| p == QLatin1String("mingw32msvc") || p == QLatin1String("msys") || p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")
|| p == QLatin1String("cygwin")) { || p == QLatin1String("cygwin") || p == QLatin1String("windows")) {
arch = Abi::X86Architecture; arch = Abi::X86Architecture;
os = Abi::WindowsOS; os = Abi::WindowsOS;
flavor = Abi::WindowsMSysFlavor; flavor = Abi::WindowsMSysFlavor;
@@ -1133,6 +1133,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 64; << 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) 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;