From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 20 Mar 2020 15:23:39 +0000 (+0000)
Subject: debian-hardened-buildflags-no-LO-fstack-protector-strong
X-Git-Tag: archive/raspbian/1%6.4.2-2+rpi1^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1695036830b325e53d461d7401f9882696ae202a;p=libreoffice.git

debian-hardened-buildflags-no-LO-fstack-protector-strong

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
---

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 84d26a74a3f..0d50f538ba7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -67,7 +67,6 @@ gb_CFLAGS_COMMON := \
 	-fmessage-length=0 \
 	-fno-common \
 	-pipe \
-	-fstack-protector-strong \
 
 gb_CXXFLAGS_COMMON := \
 	-Wall \
@@ -82,7 +81,6 @@ gb_CXXFLAGS_COMMON := \
 	-fmessage-length=0 \
 	-fno-common \
 	-pipe \
-	-fstack-protector-strong \
 
 gb_CXXFLAGS_DISABLE_WARNINGS = -w
 
@@ -136,8 +134,6 @@ endif
 gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
 gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
 
-gb_LinkTarget_LDFLAGS += -fstack-protector-strong
-
 ifneq ($(ENABLE_PCH),)
 ifeq ($(COM_IS_CLANG),TRUE)
 # Clang by default includes in the PCH timestamps of the files it was