[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Wed Feb 18 08:16:44 PST 2015


 solenv/gbuild/platform/com_GCC_defs.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 535ad5b239b6daa61c5fbaf6b644f66640b923b8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 18 17:13:35 2015 +0100

    Also mention -fstack-protector-strong when linking
    
    ...there appear to be GCC tool-chains (like the one employed by xdg-app) that
    need some libssp_nonshared.a linked in for -fstack-protector-strong behind the
    scenes.
    
    Change-Id: Ia4dd8b11d26f3dc7fec231d6b8b7950f003333ce

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 7acd068..89f1512 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -99,6 +99,7 @@ endif
 ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
 gb_CFLAGS_COMMON += -fstack-protector-strong
 gb_CXXFLAGS_COMMON += -fstack-protector-strong
+gb_LinkTarget_LDFLAGS += -fstack-protector-strong
 endif
 
 gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)


More information about the Libreoffice-commits mailing list