From db385af52a536c86ba25ece97b0af1023b43255b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 15 Dec 2011 14:10:45 +0100
Subject: 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>
---
 src/plugins/projectexplorer/gcctoolchain.cpp | 4 ++--
 1 file 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++");
     }
-- 
cgit v1.2.1