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

GCC: Better mkspec suggestion on mac

Browse Source 
Change-Id: Ie613fc0b2ba6a06b5726bf40aa50958c84b9b772
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Mirko Boehm <mirko@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-12-15 14:10:45 +01:00
parent 42a63064e1
commit db385af52a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,9 +404,9 @@ QString GccToolChain::mkspec() const
if (abi.os() == Abi::MacOS) {
QString v = version();
// prefer versioned g++ on mac. This is required to enable building for older Mac OS versions
if (v.startsWith(QLatin1String("4.0")))
if (v.startsWith(QLatin1String("4.0")) && m_compilerPath.endsWith(QLatin1String("-4.0")))
return QLatin1String("macx-g++40");
if (v.startsWith(QLatin1String("4.2")))
if (v.startsWith(QLatin1String("4.2")) && m_compilerPath.endsWith(QLatin1String("-4.2")))
return QLatin1String("macx-g++42");
return QLatin1String("macx-g++");
}