From: Debian LibreOffice Maintainers Date: Mon, 17 Jan 2022 02:12:08 +0000 (+0000) Subject: debian-hardened-buildflags-CPPFLAGS X-Git-Tag: archive/raspbian/1%7.3.0_rc2-3+rpi1~35 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f0302dc1f9d6eb6f1cde62d4aa8c77cf27097bf6;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 1ea8292164c..df431c04453 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -92,6 +92,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 ef07c8371ef..bfe754e686f 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 08c82f5e8d1..ba5479de947 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: