diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:54:54 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:59:12 (GMT) |
| commit | 3d1b93ce6a48ee4c305c052e165e7b16f6326bd1 (patch) | |
| tree | 6e0c82be229f830774daeb6ca3de612e5beaa0a1 /mkspecs | |
| parent | 722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c (diff) | |
| download | Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.zip Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.tar.gz Qt-3d1b93ce6a48ee4c305c052e165e7b16f6326bd1.tar.bz2 | |
mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
Since gcc-base is used for Clang and LLVM as well, we should not define
QMAKE_CC and QMAKE_CXX there. Moving it to g++-base.conf reduces the risk
of parsing errors in configure such as the one in dacda67ee449b6291.
Reviewed-by: ossi
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/g++-base.conf | 13 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 7 | ||||
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 3 |
3 files changed, 10 insertions, 13 deletions
diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf index d73b38f..eb5b7d6 100644 --- a/mkspecs/common/g++-base.conf +++ b/mkspecs/common/g++-base.conf @@ -8,13 +8,20 @@ # you can use the manual test in tests/manual/mkspecs. # -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g - -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO +QMAKE_CC = gcc QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g + +QMAKE_CXX = g++ + +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO + QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 5ba0c31..0e90666 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -31,8 +31,6 @@ # you can use the manual test in tests/manual/mkspecs. # -QMAKE_CC = gcc - QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W @@ -44,8 +42,6 @@ QMAKE_CFLAGS_STATIC_LIB += -fPIC QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -QMAKE_CXX = g++ - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON @@ -57,9 +53,6 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX - QMAKE_LFLAGS += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 0fd2c74..e402e54 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -13,9 +13,6 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = gcc -QMAKE_CXX = g++ - include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) |