diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-12-15 14:10:45 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-12-20 13:00:57 +0100 |
| commit | db385af52a536c86ba25ece97b0af1023b43255b (patch) | |
| tree | 69e50cc0698da5bc338391433987988a050c92d6 | |
| parent | 42a63064e1ed20cded16e157ca61a7b13332972c (diff) | |
| download | qt-creator-db385af52a536c86ba25ece97b0af1023b43255b.tar.gz | |
GCC: Better mkspec suggestion on mac
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>
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 24aeb95908..7c0dbd0d27 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -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++"); } |