From: Debian LibreOffice Maintainers Date: Fri, 6 Sep 2019 14:06:05 +0000 (+0100) Subject: debian-hardened-buildflags-CPPFLAGS X-Git-Tag: archive/raspbian/1%6.3.2_rc1-1+rpi1^2~26 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6dc19ce3ebccf61c81e0895f3f60bf019bb6f62;p=libreoffice.git 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 74ed02f23d2..f41df4c2d52 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -83,6 +83,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 91029d4c13a..7ce1833d57b 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 88904117200..6e6cc5a92f3 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -255,6 +255,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: