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

Build fix

Browse Source 
Change-Id: I2cef68b757d6f0affd21151a7f59029dce814c95
Reviewed-on: http://codereview.qt-project.org/4485
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-09-08 19:44:34 +02:00
committed by Tobias Hunger
parent aaf260c04b
commit 5eb4c8a301
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,10 +412,14 @@ QString GccToolChain::mkspec() const
return QLatin1String("macx-g++");
}
Abi gccAbi = Abi::abisOfBinary(m_compilerPath);
if (gccAbi.architecture() != abi.architecture()
|| gccAbi.os() != abi.os()
|| gccAbi.osFlavor() != abi.osFlavor()) {
QList<Abi> gccAbiList = Abi::abisOfBinary(m_compilerPath);
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 QString(); // this is a cross-compiler, leave the mkspec alone!
}