summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-01 10:02:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-02 14:33:25 +0000
commit34555600b019a85f0aec0a9d18e7833bc934788b (patch)
tree040f82e4839c7bb9f0209c912a4ad003096c5614 /solenv
parentmark numbers as untranslatable (diff)
downloadcore-34555600b019a85f0aec0a9d18e7833bc934788b.tar.gz
core-34555600b019a85f0aec0a9d18e7833bc934788b.zip
attempt to default enable stack-protector-strong
Change-Id: Iee42b3f6ab66636961e9ba1da33ab0e83d607eaa Reviewed-on: https://gerrit.libreoffice.org/13241 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index b6d973536113..7acd06808471 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,11 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden
endif
endif
+ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
+gb_CFLAGS_COMMON += -fstack-protector-strong
+gb_CXXFLAGS_COMMON += -fstack-protector-strong
+endif
+
gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
# This is the default in non-C++11 mode