File: debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

package info (click to toggle)
libreoffice 4%3A25.8.3-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 3,819,392 kB
  • sloc: cpp: 4,379,681; xml: 498,929; java: 257,215; python: 80,923; ansic: 33,824; perl: 30,305; javascript: 19,722; sh: 11,717; makefile: 10,616; cs: 8,865; yacc: 8,549; objc: 2,131; lex: 1,379; asm: 1,231; awk: 996; pascal: 914; csh: 20; sed: 5
file content (32 lines) | stat: -rw-r--r-- 1,252 bytes parent folder | download | duplicates (7)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 712a61df544f..0d50f538ba7b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -77,7 +77,6 @@ gb_CFLAGS_COMMON := \
 	-fno-common \
 	-pipe \
 	$(if $(ENABLE_HARDENING_FLAGS),$(HARDENING_CFLAGS)) \
-	$(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
 
 gb_CXXFLAGS_COMMON := \
 	-Wall \
@@ -94,7 +93,6 @@ gb_CXXFLAGS_COMMON := \
 	-fno-common \
 	-pipe \
 	$(if $(ENABLE_HARDENING_FLAGS),$(HARDENING_CFLAGS)) \
-	$(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
 
 ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
 gb_CXXFLAGS_COMMON += -Wdeprecated-copy-dtor
@@ -136,8 +134,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