diff options
| author | João Abecasis <joao@abecasis.name> | 2009-05-06 16:17:12 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2009-05-08 11:39:18 (GMT) |
| commit | 6f1946e92e01582cdfb5712ccb9ee734f9af7743 (patch) | |
| tree | 92895ff5c4560e9d13fbc4f417550942b7924128 /mkspecs | |
| parent | b5adcbd322d9ae34b54ccde5a4d5835a2078f7db (diff) | |
| download | Qt-6f1946e92e01582cdfb5712ccb9ee734f9af7743.zip Qt-6f1946e92e01582cdfb5712ccb9ee734f9af7743.tar.gz Qt-6f1946e92e01582cdfb5712ccb9ee734f9af7743.tar.bz2 | |
macx-g++42 spec linker was gcc instead of gcc-4.2
Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d
Task-number: 253052
Reviewed-by: Norwegian Rock Cat
Reviewed-by: MortenS
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/mac-g++.conf | 8 | ||||
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-g++42/qmake.conf | 11 |
3 files changed, 9 insertions, 14 deletions
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf index b764b26..eaae1aa 100644 --- a/mkspecs/common/mac-g++.conf +++ b/mkspecs/common/mac-g++.conf @@ -46,10 +46,10 @@ 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 = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_C = gcc -QMAKE_LINK_C_SHLIB = gcc +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 64ef801..4355073 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -12,9 +12,9 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -include(../common/mac-g++.conf) - QMAKE_CC = gcc QMAKE_CXX = g++ +include(../common/mac-g++.conf) + load(qt_config) diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index 4c4f5c3..06bbdcb 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -12,14 +12,9 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -include(../common/mac-g++.conf) - +QMAKE_CC = gcc-4.2 +QMAKE_CXX = g++-4.2 -QMAKE_CC = gcc-4.2 -QMAKE_CXX = g++-4.2 -QMAKE_LINK = g++-4.2 -QMAKE_LINK_SHLIB = g++-4.2 -QMAKE_LINK_C = gcc-4.2 -QMAKE_LINK_C_SHLIB = gcc-4.2 +include(../common/mac-g++.conf) load(qt_config) |