From: Debian LibreOffice Maintainers Date: Sat, 16 Jul 2022 10:57:00 +0000 (+0100) Subject: debian-hardened-buildflags-CPPFLAGS X-Git-Tag: archive/raspbian/1%7.3.5_rc2-1+rpi1^2~31 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76e58e9f0949066d0675b2e32a6ee17eca34c712;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 dae0acb4541..cf62cf84865 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -94,6 +94,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 CUCKOO_CFLAGS=$(gb_SPACE)@CUCKOO_CFLAGS@ export CURL=@CURL@ diff --git a/configure.ac b/configure.ac index da21c2f1ae2..546fde93cf6 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 6d074400748..cbe96ece027 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -260,6 +260,8 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: