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/common/gcc-base.conf | |
| 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/common/gcc-base.conf')
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 7 |
1 files changed, 0 insertions, 7 deletions
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 += |