diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 14:04:59 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 14:09:27 (GMT) |
| commit | 270d89651a17dd0a326e6ad20278080d4d6852b7 (patch) | |
| tree | f3e4433c1d43f2eaf8634695f0b99040e97c3f98 | |
| parent | 23dbce55e0859849c1f492414c53d1a0fb8bd446 (diff) | |
| download | Qt-270d89651a17dd0a326e6ad20278080d4d6852b7.zip Qt-270d89651a17dd0a326e6ad20278080d4d6852b7.tar.gz Qt-270d89651a17dd0a326e6ad20278080d4d6852b7.tar.bz2 | |
Some fixes for LLVM on the Mac.
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
| -rw-r--r-- | mkspecs/common/mac-llvm.conf | 4 | ||||
| -rw-r--r-- | 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) |