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

Mac: Do not override mkspec when cross-compiling

Browse Source 
Change-Id: I6fc17a80f99002a99c1218f3fea18e52c2aad40d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-02-02 11:56:09 +01:00
parent 09a1ecf5c2
commit 3afd3a37d3
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -414,6 +414,14 @@ Utils::FileName GccToolChain::debuggerCommand() const
Utils::FileName GccToolChain::mkspec() const
{
Abi abi = targetAbi();
Abi host = Abi::hostAbi();
// Cross compile: Leave the mkspec alone!
if (abi.architecture() != host.architecture()
|| abi.os() != host.os()
|| abi.osFlavor() != host.osFlavor()) // Note: This can fail:-(
return Utils::FileName();
if (abi.os() == Abi::MacOS) {
QString v = version();
// prefer versioned g++ on mac. This is required to enable building for older Mac OS versions
@@ -424,26 +432,17 @@ Utils::FileName GccToolChain::mkspec() const
return Utils::FileName::fromString(QLatin1String("macx-g++"));
}
QList<Abi> gccAbiList = Abi::abisOfBinary(m_compilerCommand);
Abi gccAbi;
if (!gccAbiList.isEmpty())
gccAbi = gccAbiList.first();
if (!gccAbi.isNull()
&& (gccAbi.architecture() != abi.architecture()
|| gccAbi.os() != abi.os()
|| gccAbi.osFlavor() != abi.osFlavor())) {
// Note: This can fail:-(
return Utils::FileName(); // this is a cross-compiler, leave the mkspec alone!
}
if (abi.os() == Abi::LinuxOS) {
if (abi.osFlavor() != Abi::GenericLinuxFlavor)
return Utils::FileName(); // most likely not a desktop, so leave the mkspec alone.
if (abi.wordWidth() == gccAbi.wordWidth())
if (abi.wordWidth() == host.wordWidth())
return Utils::FileName::fromString(QLatin1String("linux-g++")); // no need to explicitly set the word width
return Utils::FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
}
if (abi.os() == Abi::BsdOS && abi.osFlavor() == Abi::FreeBsdFlavor)
return Utils::FileName::fromString(QLatin1String("freebsd-g++"));
return Utils::FileName();
}