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

Abi: Make *-linux-generic-* compatible with *-linux-*

Browse Source
This commit is contained in:
Tobias Hunger
2011-03-28 15:25:50 +02:00
parent 38326a28b7
commit 08423ddd34
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,11 +351,20 @@ bool Abi::operator == (const Abi &other) const
bool Abi::isCompatibleWith(const Abi &other) const
{
return (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
&& (os() == other.os() || other.os() == Abi::UnknownOS)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
bool isCompat = (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
&& (os() == other.os() || other.os() == Abi::UnknownOS)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
// *-linux-generic-* is compatible with *-linux-*:
if (!isCompat && architecture() == other.architecture()
&& os() == other.os()
&& osFlavor() == GenericLinuxFlavor
&& other.os() == LinuxOS
&& binaryFormat() == other.binaryFormat()
&& wordWidth() == other.wordWidth())
isCompat = true;
return isCompat;
}
bool Abi::isValid() const