strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workaround for x86 gcc 4.6.1 link failure

Browse source
This commit is contained in:
Caolán McNamara 2011-07-05 10:22:23 +01:00
parent e6220841c6
commit 148e0ccb50
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sc/Library_vbaobj.mk
View file

@ -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 \