debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff

diff --git a/config_host.mk.in b/config_host.mk.in
index f6f4e33e00f65593a63b1b743a4773e2338d88c3..0f7f5144219b9eab17ebc1bdd264e0f5685bab7c 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -76,6 +76,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 d5ff2e63f36e56903bbca685a77804b409c4ac3f..5c99370ee0628d529d1748494dcbdc23103365cb 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 46d0761e7316f076262894e9eb2873887e8dceea..75be87f69de5ced0325ebe2f0ae986d33aed547f 100644 (file)
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,6 +238,8 @@ gb_GLOBALDEFS += \
                ENABLE_LTO \
        )
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # This is used to detect whether LibreOffice is being built (as opposed to building