diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-03 14:38:45 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 14:57:35 (GMT) |
| commit | 0ba35fd5a81df57fb0f943c3dddd35d43ebc3383 (patch) | |
| tree | 500d7121d09ba477b15d6f699805f669185035fe /mkspecs | |
| parent | 1565d4a6337a67fbc3e892664e02465230817c40 (diff) | |
| download | Qt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.zip Qt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.tar.gz Qt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.tar.bz2 | |
mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.
Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the
freebsd-g++46 mkspec use g++-base.conf, which on its turn resets
QMAKE_CC and QMAKE_CXX to other values.
Redefine them to gcc46 and g++46, respectively (and fix the linker
values) after the inclusion of g++-unix.conf so the settings are not
lost.
Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to
qt5/qtbase.
Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/freebsd-g++46/qmake.conf | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf index 6eb19c1..6d21a4c 100644 --- a/mkspecs/freebsd-g++46/qmake.conf +++ b/mkspecs/freebsd-g++46/qmake.conf @@ -12,10 +12,6 @@ QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CC = gcc46 - -QMAKE_CXX = g++46 - # Addon software goes into /usr/local on the BSDs, by default we will look there QMAKE_INCDIR = /usr/local/include QMAKE_LIBDIR = /usr/local/lib @@ -55,4 +51,14 @@ QMAKE_MKDIR = mkdir -p include(../common/unix.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) + +# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX +# to gcc and g++, respectively. +QMAKE_CC = gcc46 +QMAKE_CXX = g++46 +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + load(qt_config) |