diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-10-02 13:54:33 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-09 15:15:17 +0000 |
| commit | 9ff1310af51814e521572fa3de4e086907633a90 (patch) | |
| tree | d3b1902b99174adee2f04e92bdc50613bba0c138 /mkspecs/macx-icc/qmake.conf | |
| parent | a3a7d485fa2d572225c7050badf28784316aec37 (diff) | |
Distinguish between Objective-C and Objective-C++ sources
Instead of lumping both Objective-C (.m) and Objective-C++ (.mm) sources
into the same pile, passing them on to the same compiler as for C++ (CXX),
with the C++ flags (CXXFLAGS), we follow Apple's lead and treat them as
variants of the C and C++ languages separately, so that Objective-C
sources are built with CC and with CFLAGS, and Objective-C++ sources
with CXX, and CXXFLAGS.
This lets us remove a lot of duplicated flags and definitions from the
QMAKE_OBJECTIVE_CFLAGS variable, which in 99% of the cases just matched
the C++ equivalent. The remaining Objective-C/C++ flags are added to
CFLAGS/CXXFLAGS, as the compiler will just ignore them when running in
C/C++ mode. This matches Xcode, which also doesn't have a separate build
setting for Objective-C/C++ flags.
The Makefile qmake generator has been rewritten to support Objective-C/C++
fully, by not assuming that we're just iterating over the C and C++
extensions when dealing with compilation rules, precompiled headers, etc.
There's some duplicated logic in this code, as inherent by qmake's already
duplicated code paths, but this can be cleaned up when C++11 support is
mandatory and we can use lambda functions.
Task-number: QTBUG-36575
Change-Id: I4f06576d5f49e939333a2e03d965da54119e5e31
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'mkspecs/macx-icc/qmake.conf')
| -rw-r--r-- | mkspecs/macx-icc/qmake.conf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index efce568ea9..70ea5ee80f 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -34,14 +34,6 @@ QMAKE_CFLAGS_SSE4_2 += -msse4.2 QMAKE_CFLAGS_AVX += -mavx QMAKE_CFLAGS_AVX2 += -march=core-avx2 -QMAKE_OBJECTIVE_CC = clang -QMAKE_OBJECTIVE_CFLAGS = -pipe -QMAKE_OBJECTIVE_CFLAGS_WARN_ON = -Wall -W -QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = -w -QMAKE_OBJECTIVE_CFLAGS_RELEASE = -Os -QMAKE_OBJECTIVE_CFLAGS_DEBUG = -g -QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = -fvisibility=hidden - QMAKE_CXX = icpc QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |