From df2c051f720b5859c37834dd4a4b97bb874b6cee Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 21 Jun 2020 12:07:16 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 467897 -> 468037 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 9d51a9f5d1c..b68989207b7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -86,6 +86,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 b9e3ed6e563fadce9937b9fd7466c4a9c63cd71c..80843dd41b365937ec38d8e263641a837fa8f7f2 100644 GIT binary patch delta 176 zcmdmaT;}KrnT8g|7N!>F7M3ln+n?2ErYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9 zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9F7M3ln+n=>NKWE+U{G5%+768DA3=#kU diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d41c40123bc..29d78aafff5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -251,6 +251,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2