1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make qmakespecs announce the compiler family

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-09-13 22:17:33 +02:00 committed by The Qt Project
parent 38832db576
commit fff5a8f9c9
55 changed files with 123 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/aix-g++-64/qmake.conf
View File

@ -5,6 +5,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/aix-g++/qmake.conf
View File

@ -5,6 +5,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/aix-xlc-64/qmake.conf
View File

@ -5,6 +5,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
QMAKE_COMPILER = ibm_xlc
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
QMAKE_LEX = flex

2
mkspecs/aix-xlc/qmake.conf
View File

@ -5,6 +5,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
QMAKE_COMPILER = ibm_xlc
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
QMAKE_LEX = flex

2
mkspecs/common/armcc.conf
View File

@ -2,6 +2,8 @@
# qmake configuration for armcc
#
QMAKE_COMPILER = armcc
CONFIG += rvct_linker
QMAKE_CC = armcc
QMAKE_CFLAGS +=

2
mkspecs/common/clang.conf
View File

@ -2,6 +2,8 @@
# Qmake configuration for Clang on Linux and Mac
#
QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
QMAKE_CC = clang
QMAKE_CXX = clang++

2
mkspecs/common/g++-base.conf
View File

@ -8,6 +8,8 @@
# you can use the manual test in tests/manual/mkspecs.
#
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LINK_C = $$QMAKE_CC

2
mkspecs/common/llvm.conf
View File

@ -2,6 +2,8 @@
# Qmake configuration for LLVM on Linux and Mac
#
QMAKE_COMPILER = gcc llvm
QMAKE_CC = llvm-gcc
QMAKE_CXX = llvm-g++

2
mkspecs/common/qcc-base.conf
View File

@ -9,6 +9,8 @@
# 2) -Wno-psabi is added to silence harmless warnings about va_list mangling
#
QMAKE_COMPILER = rim_qcc gcc # qcc is mostly gcc in disguise
QMAKE_CFLAGS += -Wno-psabi
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W

2
mkspecs/common/wince/qmake.conf
View File

@ -10,6 +10,8 @@ DEFINES += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32 QT_NO_PRINTER QT_N
QMAKE_COMPILER_DEFINES += _MSC_VER=1400
QMAKE_COMPILER = msvc
QMAKE_CC = cl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/cygwin-g++/qmake.conf
View File

@ -9,6 +9,8 @@ QMAKE_PLATFORM = cygwin unix posix
CONFIG += incremental
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/darwin-g++/qmake.conf
View File

@ -9,6 +9,8 @@ QMAKE_PLATFORM = mac macx
CONFIG += native_precompiled_headers
DEFINES += __USE_WS_X11__
QMAKE_COMPILER = gcc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

15
mkspecs/features/spec_post.prf
View File

@ -29,3 +29,18 @@ isEmpty(QMAKE_PLATFORM) {
error("Qmake spec sets an invalid TARGET_PLATFORM.")
}
CONFIG += $$QMAKE_PLATFORM
isEmpty(QMAKE_COMPILER) {
*-g++*: \
QMAKE_COMPILER = gcc
else:*-llvm*: \
QMAKE_COMPILER = gcc llvm
else:*-clang*: \
QMAKE_COMPILER = clang llvm
else:*-msvc*: \
QMAKE_COMPILER = msvc
else: \
error("qmake spec does not announce the compiler family, and it cannot be guessed.")
warning("qmake spec does not announce the compiler family. Guessed $$QMAKE_COMPILER.")
}
CONFIG += $$QMAKE_COMPILER

2
mkspecs/freebsd-icc/qmake.conf
View File

@ -30,6 +30,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = freebsd bsd
QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc
QMAKE_CC = icc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpux-acc-64/qmake.conf
View File

@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
QMAKE_COMPILER = hp_acc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpux-acc-o64/qmake.conf
View File

@ -48,6 +48,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
QMAKE_COMPILER = hp_acc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpux-acc/qmake.conf
View File

@ -28,6 +28,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
QMAKE_COMPILER = hp_acc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpux-g++-64/qmake.conf
View File

@ -8,6 +8,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpux-g++/qmake.conf
View File

@ -9,6 +9,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += plugin_no_soname
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/hpuxi-acc-32/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += plugin_no_soname
QMAKE_COMPILER = hp_acc
QMAKE_CC = cc
QMAKE_LEX = lex
QMAKE_LEXFLAGS =

2
mkspecs/hpuxi-acc-64/qmake.conf
View File

@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += plugin_no_soname
QMAKE_COMPILER = hp_acc
QMAKE_CC = cc
QMAKE_LEX = lex
QMAKE_LEXFLAGS =

2
mkspecs/hpuxi-g++-64/qmake.conf
View File

@ -13,6 +13,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/irix-cc-64/qmake.conf
View File

@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
QMAKE_COMPILER_DEFINES += __sgi __EDG
QMAKE_COMPILER = sgi_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/irix-cc/qmake.conf
View File

@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
QMAKE_COMPILER_DEFINES += __sgi __EDG
QMAKE_COMPILER = sgi_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/irix-g++-64/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
QMAKE_COMPILER_DEFINES += __sgi __GNUC__
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/irix-g++/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
QMAKE_COMPILER_DEFINES += __sgi __GNUC__
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/linux-cxx/qmake.conf
View File

@ -7,6 +7,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
QMAKE_COMPILER = compaq_cc
QMAKE_CC = ccc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/linux-icc/qmake.conf
View File

@ -5,6 +5,8 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += gdb_dwarf_index
QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc
QMAKE_CC = icc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/linux-kcc/qmake.conf
View File

@ -16,6 +16,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
QMAKE_COMPILER = kai_cc
QMAKE_CC = KCC
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/linux-pgcc/qmake.conf
View File

@ -7,6 +7,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
QMAKE_COMPILER = portland_cc
QMAKE_CC = pgcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/lynxos-g++/qmake.conf
View File

@ -9,6 +9,8 @@ QMAKE_PLATFORM = lynxos
CONFIG += incremental
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/macx-icc/qmake.conf
View File

@ -17,6 +17,8 @@ CONFIG += app_bundle
QMAKE_INCREMENTAL_STYLE = sublibs
QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc
QMAKE_CC = icc
QMAKE_CFLAGS = -wd858,1572,1569,279
QMAKE_CFLAGS_DEPS = -M

2
mkspecs/macx-xlc/qmake.conf
View File

@ -8,6 +8,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = mac macx
CONFIG += app_bundle global_init_link_order lib_version_first plugin_no_soname
QMAKE_COMPILER = ibm_xlc
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
QMAKE_LEX = flex

2
mkspecs/netbsd-g++/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = netbsd bsd
CONFIG += gdb_dwarf_index
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/openbsd-g++/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = openbsd bsd
CONFIG += gdb_dwarf_index
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/sco-cc/qmake.conf
View File

@ -10,6 +10,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = sco
QMAKE_COMPILER = sco_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/sco-g++/qmake.conf
View File

@ -7,6 +7,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = sco
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/solaris-cc-64/qmake.conf
View File

@ -24,6 +24,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
QMAKE_COMPILER = sun_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/solaris-cc/qmake.conf
View File

@ -7,6 +7,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
QMAKE_COMPILER = sun_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/solaris-g++-64/qmake.conf
View File

@ -28,6 +28,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/solaris-g++/qmake.conf
View File

@ -11,6 +11,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/tru64-cxx/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = tru64
CONFIG += plugin_no_soname
QMAKE_COMPILER = dec_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/tru64-g++/qmake.conf
View File

@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = tru64
CONFIG += plugin_no_soname
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/unixware-cc/qmake.conf
View File

@ -10,6 +10,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = unixware
QMAKE_COMPILER = sco_cc
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/unixware-g++/qmake.conf
View File

@ -7,6 +7,8 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = unixware
QMAKE_COMPILER = gcc
QMAKE_CC = gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/unsupported/linux-host-g++/qmake.conf
View File

@ -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

2
mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
View File

@ -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 +=

2
mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
View File

@ -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 +=

2
mkspecs/unsupported/win32-msvc2003/qmake.conf
View File

@ -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 =

2
mkspecs/win32-g++/qmake.conf
View File

@ -18,6 +18,8 @@ QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
QMAKE_COMPILER = gcc
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/win32-icc/qmake.conf
View File

@ -10,6 +10,8 @@ CONFIG += incremental flat debug_and_release debug_and_release_target
DEFINES += UNICODE
QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32
QMAKE_COMPILER = msvc intel_icl # icl pretends to be msvc
QMAKE_CC = icl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/win32-msvc2005/qmake.conf
View File

@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32
QMAKE_COMPILER = msvc
QMAKE_CC = cl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/win32-msvc2008/qmake.conf
View File

@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32
QMAKE_COMPILER = msvc
QMAKE_CC = cl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/win32-msvc2010/qmake.conf
View File

@ -10,6 +10,8 @@ CONFIG += incremental flat precompile_header autogen_precompile
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1600 WIN32
QMAKE_COMPILER = msvc
QMAKE_CC = cl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =

2
mkspecs/win32-msvc2012/qmake.conf
View File

@ -9,6 +9,8 @@ CONFIG += incremental flat precompile_header autogen_precompile
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32
QMAKE_COMPILER = msvc
QMAKE_CC = cl
QMAKE_LEX = flex
QMAKE_LEXFLAGS =