1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Account for LC_BUILD_VERSION when checking SDK version and deployment target

Browse Source 
The more modern LC_BUILD_VERSION load command was introduced in the 10.13
SDK to unify the various versions of the LC_*_VERSION_MIN command. When
building with a deployment target of 10.14, the linker will use this
load command instead.

Change-Id: Ic3571fdbfdf4dfb9346128c6f6e75d1e06f86cd2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-11-30 14:51:18 +01:00
parent 1314d2688c
commit b82559244e
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/platforms/cocoa/qcocoahelpers.mm
View File

@ -402,23 +402,30 @@ QOperatingSystemVersion QMacVersion::currentRuntime()
QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader) QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machHeader)
{ {
static auto makeVersionTuple = [](uint32_t dt, uint32_t sdk) {
return qMakePair(
QOperatingSystemVersion(QOperatingSystemVersion::MacOS,
dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff),
QOperatingSystemVersion(QOperatingSystemVersion::MacOS,
sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff)
);
};
auto commandCursor = uintptr_t(machHeader) + sizeof(mach_header_64); auto commandCursor = uintptr_t(machHeader) + sizeof(mach_header_64);
for (uint32_t i = 0; i < machHeader->ncmds; ++i) { for (uint32_t i = 0; i < machHeader->ncmds; ++i) {
load_command *loadCommand = reinterpret_cast<load_command *>(commandCursor); load_command *loadCommand = reinterpret_cast<load_command *>(commandCursor);
if (loadCommand->cmd == LC_VERSION_MIN_MACOSX) { if (loadCommand->cmd == LC_VERSION_MIN_MACOSX) {
auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand); auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand);
uint32_t dt = versionCommand->version; // Deployment target return makeVersionTuple(versionCommand->version, versionCommand->sdk);
uint32_t sdk = versionCommand->sdk; // Build SDK #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13)
return qMakePair( } else if (loadCommand->cmd == LC_BUILD_VERSION) {
QOperatingSystemVersion(QOperatingSystemVersion::MacOS, auto versionCommand = reinterpret_cast<build_version_command *>(loadCommand);
dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff), return makeVersionTuple(versionCommand->minos, versionCommand->sdk);
QOperatingSystemVersion(QOperatingSystemVersion::MacOS, #endif
sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff)
);
} }
commandCursor += loadCommand->cmdsize; commandCursor += loadCommand->cmdsize;
} }
Q_ASSERT_X(false, "QCocoaIntegration", "Could not find version-min load command"); Q_ASSERT_X(false, "QCocoaIntegration", "Could not find any version load command");
Q_UNREACHABLE(); Q_UNREACHABLE();
} }