diff options
author | Peter Hartmann <phartmann@rim.com> | 2012-09-20 14:11:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 10:22:06 +0200 |
commit | 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f (patch) | |
tree | 9e06efdf82597af4ed89ce5200aca898a137fba9 /mkspecs/blackberry-x86-qcc | |
parent | c6271071b4d0686fef8fe3df215ce84be0305a8b (diff) |
Blackberry mkspecs: Refine compiler options
stack-protector-strong gives performance benefits over
stack-protector-all and is still checking more than -stack-protector,
so seems to be a good middle way and we want to use it when it is
there.
The -shared option for the compiler (not the linker) prevents a
RIM internal version of qcc from forcing -fPIE, and should not harm
in general when set.
In addition, add a method "compilerSupportsFlag" for Windows as is
present in the Unix configure script.
Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5
Original-patch-by: Greg Bentz
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'mkspecs/blackberry-x86-qcc')
-rw-r--r-- | mkspecs/blackberry-x86-qcc/qmake.conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/blackberry-x86-qcc/qmake.conf b/mkspecs/blackberry-x86-qcc/qmake.conf index 24bbffe920..4dc3da6c07 100644 --- a/mkspecs/blackberry-x86-qcc/qmake.conf +++ b/mkspecs/blackberry-x86-qcc/qmake.conf @@ -2,11 +2,17 @@ # qmake configuration for blackberry x86 systems # +load(qt_config) + DEFINES += Q_OS_BLACKBERRY CONFIG += blackberry LIBS += -lbps # Blackberry also has support for stack smashing protection in its libc -QMAKE_CFLAGS += -fstack-protector -fstack-protector-all +contains(QT_CONFIG, stack-protector-strong) { + QMAKE_CFLAGS += -fstack-protector-strong +} else { + QMAKE_CFLAGS += -fstack-protector -fstack-protector-all +} include(../common/qcc-base-qnx-x86.conf) |