diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-13 22:17:33 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 02:44:22 +0200 |
commit | fff5a8f9c987e5e285b2665c4d0a1c5bbe3e6276 (patch) | |
tree | d7db5fc49dd07731a0014a10de2c94f425fc023f /mkspecs/unsupported | |
parent | 38832db576b3dbe629f85a6e64431f92ee2f48bc (diff) | |
download | qtbase-fff5a8f9c987e5e285b2665c4d0a1c5bbe3e6276.tar.gz |
make qmakespecs announce the compiler family
on the way to eliminate scoping based on the spec.
gcc and msvc go as such into CONFIG, the other ones get the vendor
prefixed, as most are mostly unknown and thus likely to clash with
users' flags.
Change-Id: Ie622f53d90e96dbf05ce7d8c638cd355f04fa20c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/unsupported')
4 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf index 7437e784ce..3e5840e7f4 100644 --- a/mkspecs/unsupported/linux-host-g++/qmake.conf +++ b/mkspecs/unsupported/linux-host-g++/qmake.conf @@ -21,6 +21,8 @@ QMAKE_INCREMENTAL_STYLE = sublib # qmake configuration for common gcc # +QMAKE_COMPILER = gcc + QMAKE_CC = host-gcc QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf index 7576b76ceb..c5429aedf9 100644 --- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf @@ -12,6 +12,8 @@ VXWORKS_CPU = PPC32 VXWORKS_DIAB_SPEC = -tPPC7400FV:vxworks66 VXWORKS_ARCH_MUNCH = ppc +QMAKE_COMPILER = wr_dcc + QMAKE_CC = dcc QMAKE_CFLAGS += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\' QMAKE_CFLAGS_DEPS += diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf index 3cf7decf78..4729daf3e7 100644 --- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf @@ -12,6 +12,8 @@ VXWORKS_CPU = SIMLINUX VXWORKS_DIAB_SPEC = -tX86LH:vxworks66 VXWORKS_ARCH_MUNCH = pentium +QMAKE_COMPILER = wr_dcc + QMAKE_CC = dcc QMAKE_CFLAGS += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\' QMAKE_CFLAGS_DEPS += diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf index ba85427f2b..3439472f85 100644 --- a/mkspecs/unsupported/win32-msvc2003/qmake.conf +++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf @@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32 +QMAKE_COMPILER = msvc + QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = |