diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-25 18:53:31 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-27 22:29:55 +0200 |
| commit | fa98adbd04de9d44ce921436b92589a41f285dcd (patch) | |
| tree | 608a791b4c52bf0fb9dcf7a0769bac14b9a19289 /src/3rdparty | |
| parent | 9c31acbf47a6f3d11da30b56f2499493b70064bc (diff) | |
Fix compilation of PCRE2 under Intel CET
Ubuntu 20.04 enables -fcf-protection by default.
PCRE2 10.35 sees this but complains that -mshstk is also necessary
to build its JIT. Detect whether the compiler is enabling Intel CET
automatically, and if so, build PCRE2 with the right options.
Pick-to: 5.15
Change-Id: I3440e689b81f4f07055f211a4fa7331a43eb410d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri index fa901f783f..b11ec7302a 100644 --- a/src/3rdparty/pcre2/pcre2.pri +++ b/src/3rdparty/pcre2/pcre2.pri @@ -5,6 +5,11 @@ win32: MODULE_DEFINES += PCRE2_STATIC DEFINES += HAVE_CONFIG_H +qtConfig(intelcet) { + QMAKE_CFLAGS += QMAKE_CFLAGS_SHSTK + QMAKE_CXXFLAGS += QMAKE_CXXFLAGS_SHSTK +} + SOURCES += \ $$PWD/src/pcre2_auto_possess.c \ $$PWD/src/pcre2_chartables.c \ |