[Libreoffice-commits] .: 2 commits - sc/Library_vbaobj.mk

[Caolán McNamara]

 sc/Library_vbaobj.mk |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit e53ccf5084cf268ebc058ff09e0c79607fe00376
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 5 10:22:23 2011 +0100

    workaround for x86 gcc 4.6.1 link failure

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 51d0ed5..58dc936 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbaquerytable \
         sc/source/ui/vba/vbarange \
         sc/source/ui/vba/vbasheetobject \
-        sc/source/ui/vba/vbasheetobjects \
         sc/source/ui/vba/vbastyle \
         sc/source/ui/vba/vbastyles \
         sc/source/ui/vba/vbatextboxshape \
@@ -138,6 +137,20 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbawsfunction \
 ))
 
+#32bit Fedora gcc 4.6.1 fails to link sc without this
+#TO-DO: make standalone reproducer for this and file
+#gcc bug
+ifeq ($(strip $(COM)),GCC)
+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
+        sc/source/ui/vba/vbasheetobjects \
+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,vbaobj,\
+    sc/source/ui/vba/vbasheetobjects \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	advapi32 \
commit 9e4c127c6598a6164cdea0ed4a179d37129fa01f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 5 09:58:02 2011 +0100

    no need for extra noexecstack

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 2651c96..51d0ed5 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -138,13 +138,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbawsfunction \
 ))
 
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_set_ldflags,vbaobj,\
-	$$(LDFLAGS) \
-	-Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	advapi32 \