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/common | |
| parent | 38832db576b3dbe629f85a6e64431f92ee2f48bc (diff) | |
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/common')
| -rw-r--r-- | mkspecs/common/armcc.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/clang.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/g++-base.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/llvm.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index 4f178d745e..443ff40db4 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -2,6 +2,8 @@ # qmake configuration for armcc # +QMAKE_COMPILER = armcc + CONFIG += rvct_linker QMAKE_CC = armcc QMAKE_CFLAGS += diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 54ac56968b..8c97644044 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -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++ diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf index 35f86e5bf1..0661298b18 100644 --- a/mkspecs/common/g++-base.conf +++ b/mkspecs/common/g++-base.conf @@ -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 diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf index 86e0ab440f..7d0622de59 100644 --- a/mkspecs/common/llvm.conf +++ b/mkspecs/common/llvm.conf @@ -2,6 +2,8 @@ # Qmake configuration for LLVM on Linux and Mac # +QMAKE_COMPILER = gcc llvm + QMAKE_CC = llvm-gcc QMAKE_CXX = llvm-g++ diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index 42a2d31739..b6abb8f52d 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -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 diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index 236e445089..46f002a360 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -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 = |