From e5160ad84adb2fae9943c75dcbf7b9e3dfe29a9f Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 22 Feb 2020 13:46:04 +0000
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 9d51a9f5d1c..b68989207b7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -86,6 +86,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 7baa9c0d5a0fdd73dea25c7b704e88aead938f1c..3f4d9d4682d1570053eadb1c49ef123437341da0 100644
GIT binary patch
delta 168
zcmcb8Q0Dm|nT8g|7N!>F7M3lnHy_t$rYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9
zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9<CUETE55(SvNf{~qmN@|&Y
mUTIEF0#{llm!orhaHvyohz8goE`&+#*B-NOzxJ4o)fND2+BoX~

delta 34
qcmaEUNaprInT8g|7N!>F7M3lnHy=+Ac*-i(UjKx3d;Jr(7d8MA0uQSI

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d41c40123bc..29d78aafff5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -251,6 +251,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