From: Debian LibreOffice Maintainers Date: Sun, 10 Oct 2021 10:37:28 +0000 (+0100) Subject: debian-hardened-buildflags-CPPFLAGS X-Git-Tag: archive/raspbian/1%7.0.4-4+rpi1+deb11u1^2~40 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=612fb86d7ede11a1c34ac6b7d22f3a7a806acc9b;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 d6e4fc78857..6344eb9d4dc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -99,6 +99,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 e2386fce3b7..36de7f6bd8f 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 97d2879dcc9..137b6e5e9b7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -259,6 +259,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: