debian-hardened-buildflags-no-LO-fstack-protector-strong
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Thu, 23 Sep 2021 15:55:20 +0000 (16:55 +0100)
committerRene Engelhard <rene@debian.org>
Thu, 23 Sep 2021 15:55:20 +0000 (16:55 +0100)
don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

solenv/gbuild/platform/com_GCC_defs.mk

index 964c883f966bc941776c5499f461de4be7253289..c3710beede03d2305ddf7c1fea5965fd6ed93a98 100644 (file)
@@ -62,7 +62,6 @@ gb_CFLAGS_COMMON := \
        -fmessage-length=0 \
        -fno-common \
        -pipe \
-       $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
        $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 gb_CXXFLAGS_COMMON := \
@@ -79,7 +78,6 @@ gb_CXXFLAGS_COMMON := \
        -fmessage-length=0 \
        -fno-common \
        -pipe \
-       $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
        $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
@@ -144,8 +142,6 @@ endif
 gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
 gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
 
-gb_LinkTarget_LDFLAGS += $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong)
-
 ifneq ($(gb_ENABLE_PCH),)
 ifeq ($(COM_IS_CLANG),TRUE)
 # Clang by default includes in the PCH timestamps of the files it was