solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a61c9bf1902553f1b9b20d83962de640903600c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Apr 29 09:42:14 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon May 6 08:42:50 2024 +0200
ofz#68265 fix oss-fuzz build failure
Change-Id: I73087235d87253f4c8375fa0c0492c6258701571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166827
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
(cherry picked from commit f9fb7afe13aa24464eecfee82c3e81e53017d74d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166837
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index aaba5ebb0625..9029ece94f60 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -41,7 +41,7 @@ ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
gb_COMPILEROPTFLAGS := -O2
endif
-gb_COMPILEROPTFLAGS += $(HARDENING_OPT_CFLAGS)
+gb_COMPILEROPTFLAGS += $(if $(ENABLE_HARDENING_FLAGS),$(HARDENING_OPT_CFLAGS))
gb_AFLAGS := $(AFLAGS)
