diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-04-28 21:29:34 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 05:55:14 +0200 |
| commit | f42a61e76ac209db0bfeefdb03de22ce26b422bf (patch) | |
| tree | b7691214f5ea3b070b81cbe2cf3292da8c520e6c | |
| parent | ac86c8397ceca7c46de6f104c7031716e053f9fb (diff) | |
mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.
Commit 996672933a61016fdc0ec6d42d536986c5080ac5 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.
Change-Id: I2d03548fdc492c5e4c4744b636b29df2cefe2acd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -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 77658827b8..faa79f8e69 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 @@ -52,4 +48,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) |