diff options
Diffstat (limited to 'src/lib/corelib/tools')
| -rw-r--r-- | src/lib/corelib/tools/architectures.cpp | 23 | ||||
| -rw-r--r-- | src/lib/corelib/tools/architectures.h | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/architectures.cpp b/src/lib/corelib/tools/architectures.cpp index ca43b90c7..02f0fc868 100644 --- a/src/lib/corelib/tools/architectures.cpp +++ b/src/lib/corelib/tools/architectures.cpp @@ -46,6 +46,29 @@ namespace qbs { +QString canonicalTargetArchitecture(const QString &architecture, + const QString &vendor, + const QString &system, + const QString &abi) +{ + const QString arch = canonicalArchitecture(architecture); + const bool isApple = (vendor == QStringLiteral("apple") + || system == QStringLiteral("darwin") + || system == QStringLiteral("macosx") + || system == QStringLiteral("ios") + || system == QStringLiteral("tvos") + || system == QStringLiteral("watchos") + || abi == QStringLiteral("macho")); + + if (arch == QStringLiteral("armv7a") && isApple) + return QStringLiteral("armv7"); + + if (arch == QStringLiteral("x86")) + return QStringLiteral("i386"); + + return arch; +} + QString canonicalArchitecture(const QString &architecture) { QMap<QString, QStringList> archMap; diff --git a/src/lib/corelib/tools/architectures.h b/src/lib/corelib/tools/architectures.h index bb7f0d21e..ef4ebb537 100644 --- a/src/lib/corelib/tools/architectures.h +++ b/src/lib/corelib/tools/architectures.h @@ -43,6 +43,11 @@ namespace qbs { +QBS_EXPORT QString canonicalTargetArchitecture(const QString &architecture, + const QString &vendor, + const QString &system, + const QString &abi); + QBS_EXPORT QString canonicalArchitecture(const QString &architecture); } // namespace qbs |