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

Gcc: Detect arm gccs on mac properly

Browse Source 
... and add a unit test.
This commit is contained in:
Tobias Hunger
2011-04-08 16:33:59 +02:00
parent f3cc061dbe
commit c65ba85f8d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,7 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m)
if (unknownCount == parts.count())
return abiList;
if (os == Abi::MacOS) {
if (os == Abi::MacOS && arch != Abi::ArmArchitecture) {
// Apple does PPC and x86!
abiList << ProjectExplorer::Abi(arch, os, flavor, format, width);
abiList << ProjectExplorer::Abi(arch, os, flavor, format, width == 64 ? 32 : 64);
@@ -870,6 +870,9 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data()
<< QLatin1String("x86-macos-generic-mach_o-64bit")
<< QLatin1String("ppc-macos-generic-mach_o-32bit")
<< QLatin1String("ppc-macos-generic-mach_o-64bit"));
QTest::newRow("Mac IOS")
<< QString::fromLatin1("arm-apple-darwin9")
<< (QStringList() << QLatin1String("arm-macos-generic-mach_o-32bit"));
QTest::newRow("Intel 1")
<< QString::fromLatin1("86_64 x86_64 GNU/Linux")
<< (QStringList() << QLatin1String("x86-linux-generic-elf-64bit")