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

Make a few simple changes towards 64-bit iOS support.

Browse Source 
Change-Id: Ia931f98f6f155a619b9d3efa5777d0c30e62adac
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
This commit is contained in:
Jake Petroules
2014-09-28 14:48:40 -04:00
parent b72a9dd239
commit b5f4899220
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/ios/iosconfigurations.cpp
View File

@@ -123,12 +123,16 @@ void IosConfigurations::updateAutomaticKitList()
if (p.compilerPath == toolchain->compilerCommand()
&& p.backendFlags == toolchain->platformCodeGenFlags()) {
found = true;
if (p.architecture == QLatin1String("i386")
&& toolchain->targetAbi().wordWidth() != 32) {
if ((p.architecture == QLatin1String("i386")
&& toolchain->targetAbi().wordWidth() != 32) ||
(p.architecture == QLatin1String("x86_64")
&& toolchain->targetAbi().wordWidth() != 64)) {
qCDebug(kitSetupLog) << "resetting api of " << toolchain->displayName();
toolchain->setTargetAbi(Abi(Abi::X86Architecture,
Abi::MacOS, Abi::GenericMacFlavor,
Abi::MachOFormat, 32));
Abi::MachOFormat,
p.architecture.endsWith(QLatin1String("64"))
? 64 : 32));
}
platformToolchainMap[p.name] = toolchain;
qCDebug(kitSetupLog) << p.name << " -> " << toolchain->displayName();
@@ -172,10 +176,13 @@ void IosConfigurations::updateAutomaticKitList()
toolchain->setPlatformCodeGenFlags(p.backendFlags);
toolchain->setPlatformLinkerFlags(p.backendFlags);
toolchain->resetToolChain(p.compilerPath);
if (p.architecture == QLatin1String("i386")) {
if (p.architecture == QLatin1String("i386")
|| p.architecture == QLatin1String("x86_64")) {
qCDebug(kitSetupLog) << "setting toolchain Abi for " << toolchain->displayName();
toolchain->setTargetAbi(Abi(Abi::X86Architecture,Abi::MacOS, Abi::GenericMacFlavor,
Abi::MachOFormat, 32));
Abi::MachOFormat,
p.architecture.endsWith(QLatin1String("64"))
? 64 : 32));
}
qCDebug(kitSetupLog) << "adding toolchain " << p.name;
ToolChainManager::registerToolChain(toolchain);