diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2017-04-24 09:53:57 -0400 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@blackberry.com> | 2017-06-13 14:01:24 +0000 |
| commit | d0706ae3a3996ef6edc196152ad7ae6eaac24dc6 (patch) | |
| tree | 034ac229a72668d6198e290d725dd5c1dbb044f4 /mkspecs/qnx-x86-64-qcc/qmake.conf | |
| parent | 876aed331d7c6d7df81da1dace73dea49176ad1e (diff) | |
Enable stack-protector-strong for QNX 7.0.0
This was originally enabled in the mkspecs for 64-bit QNX 7.0.0
but that broke when the qtConfig change was made. It looks like
qtConfig shouldn't be used in the platform mkspecs. I suspect
the stack-protector changes were left out of the 32-bit mkspecs
so that 6.6.0 builds wouldn't be affected.
Ignore the stack-protector/stack-protector-all possibility since
it isn't possible to access it without a command line option.
Specifying both options doesn't even make sense since
stack-protector-all encompasses stack-protector.
For now, leave out command line control of this feature.
Task-number: QTBUG-59644
Change-Id: I99323216be5b592dd2c3bef6d22da195764a6e65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/qnx-x86-64-qcc/qmake.conf')
| -rw-r--r-- | mkspecs/qnx-x86-64-qcc/qmake.conf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mkspecs/qnx-x86-64-qcc/qmake.conf b/mkspecs/qnx-x86-64-qcc/qmake.conf index 2a01ed1405..c479181342 100644 --- a/mkspecs/qnx-x86-64-qcc/qmake.conf +++ b/mkspecs/qnx-x86-64-qcc/qmake.conf @@ -5,11 +5,3 @@ QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now include(../common/qcc-base-qnx-x86-64.conf) - -qtConfig(stack-protector-strong) { - QMAKE_CFLAGS += -fstack-protector-strong - QMAKE_CXXFLAGS += -fstack-protector-strong -} else { - QMAKE_CFLAGS += -fstack-protector -fstack-protector-all - QMAKE_CXXFLAGS += -fstack-protector -fstack-protector-all -} |