From cecf4cfb42cf4b6e3b80b18369d219cd5b588cac Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 1 Nov 2020 21:20:53 +0000
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 485296 -> 485436 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 69e5318b0e6..1b053b9b8f7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -99,6 +99,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 60726106564d1b0e1be9d022cebc2f493b6adb04..417b99b2922413741aee291be9f33d74bb0b393f 100644
GIT binary patch
delta 168
zcmdmRUUts~*@hOz7N!>F7M3lnkABu?rYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9
zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9<CUETE55(SvNf{~qmN@|&Y
mUTIEF0#{llm!orhaHvyohz8goE`&+#_kXf(zyFi%VlDt&&pHeM

delta 34
qcmdmUL3YD=*@hOz7N!>F7M3lnkA6;{V8Jfk-ua7ld*?5<&A9*w^bceJ

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9..137b6e5e9b7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2