From 270d89651a17dd0a326e6ad20278080d4d6852b7 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 23 Jun 2009 16:04:59 +0200 Subject: Some fixes for LLVM on the Mac. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig --- mkspecs/common/mac-llvm.conf | 4 ++-- mkspecs/macx-llvm/qmake.conf | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mkspecs/common/mac-llvm.conf b/mkspecs/common/mac-llvm.conf index 624aec4..55850c6 100644 --- a/mkspecs/common/mac-llvm.conf +++ b/mkspecs/common/mac-llvm.conf @@ -48,8 +48,8 @@ QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -QMAKE_LINK = llvm-g++ -QMAKE_LINK_SHLIB = llvm-g++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index cb8aaa1..de8040c 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -14,6 +14,4 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac-llvm.conf) -QMAKE_OBJECTIVE_CC = gcc - load(qt_config) -- cgit v0.12