diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-05 10:22:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-05 10:23:23 +0100 |
| commit | e53ccf5084cf268ebc058ff09e0c79607fe00376 (patch) | |
| tree | 2fd44df3c8ffe63a0b179be879c28f48cae69aaa | |
| parent | 9e4c127c6598a6164cdea0ed4a179d37129fa01f (diff) | |
workaround for x86 gcc 4.6.1 link failure
| -rw-r--r-- | sc/Library_vbaobj.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 51d0ed5c6..58dc9369c 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 \ |