Commit e7c118c7 authored by Tobias Hunger's avatar Tobias Hunger

ABI: Make "linux-generic" ABIs compatible with "linux-*"

This is for the benefit of people using e.g. meego tool chains to
build their own Qt versions and work with them in the desktop
target.

All the specialized targets filter the tool chains again, so
this should be ok to do.

Task-number: QTCREATORBUG-5960
Change-Id: If872d8a6ba75985f23f36646bb89e1651ce82f80
Reviewed-on: http://codereview.qt-project.org/4521Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent f05683ac
......@@ -466,13 +466,16 @@ bool Abi::isCompatibleWith(const Abi &other) const
&& (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())
// *-linux-generic-* is compatible with *-linux-* (both ways): This is for the benefit of
// people building Qt themselves using e.g. a meego toolchain.
//
// We leave it to the specific targets to catch filter out the tool chains that do not
// work for them.
if (!isCompat && (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
&& (os() == other.os() == LinuxOS)
&& (osFlavor() == GenericLinuxFlavor || other.osFlavor() == GenericLinuxFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0))
isCompat = true;
return isCompat;
}
......
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