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 /configure.json | |
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 'configure.json')
-rw-r--r-- | configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 52831f161f..8b5f07ed54 100644 --- a/configure.json +++ b/configure.json @@ -425,8 +425,8 @@ }, "stack_protector": { "label": "stack protection", - "type": "compilerSupportsFlag", - "test": "-fstack-protector-strong" + "type": "compile", + "test": "unix/stack-protector" }, "incredibuild_xge": { "label": "IncrediBuild", @@ -930,7 +930,7 @@ "stack-protector-strong": { "label": "stack protection", "condition": "config.qnx && tests.stack_protector", - "output": [ "publicQtConfig" ] + "output": [ "privateFeature" ] }, "system-zlib": { "label": "Using system zlib", |