From: Debian LibreOffice Maintainers Date: Wed, 15 Jul 2020 18:31:45 +0000 (+0100) Subject: debian-hardened-buildflags-CPPFLAGS X-Git-Tag: archive/raspbian/1%7.0.0_rc2-1+rpi1^2~27 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=002b47c4304834e6a26d8788da51958117dd4b12;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 f1e58670a5c..0fb3328c7b7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -100,6 +100,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 8f4f95a6981..cfdf76063e5 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: