From fa98adbd04de9d44ce921436b92589a41f285dcd Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 25 May 2020 18:53:31 +0200 Subject: 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 --- mkspecs/common/gcc-base.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/common/gcc-base.conf') diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 1f919d270a..3c2d5fdd53 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -54,6 +54,7 @@ QMAKE_CFLAGS_SPLIT_SECTIONS += -ffunction-sections -fdata-sections QMAKE_CFLAGS_LTCG = -flto -fno-fat-lto-objects QMAKE_CFLAGS_LTCG_FATOBJECTS = -ffat-lto-objects QMAKE_CFLAGS_DISABLE_LTCG = -fno-lto +QMAKE_CFLAGS_SHSTK = -mshstk QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS @@ -74,6 +75,7 @@ QMAKE_CXXFLAGS_SPLIT_SECTIONS += $$QMAKE_CFLAGS_SPLIT_SECTIONS QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG +QMAKE_CXXFLAGS_SHSTK = $$QMAKE_CFLAGS_SHSTK QMAKE_LFLAGS += QMAKE_LFLAGS_DEBUG += -- cgit v1.2.3