diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-08 10:50:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-08 10:50:59 +0100 |
| commit | f2416a7f2c9851f674b3a33ed50aa4e2109ae04c (patch) | |
| tree | 533577a16fc4170780f9f11b755424dc94f1b0a0 /sc/Library_vbaobj.mk | |
| parent | 682dd34020ace097015d5742fff2d8ef06723247 (diff) | |
Related: gcc#50255 we now know the bounds of the broken gcc versions
Diffstat (limited to 'sc/Library_vbaobj.mk')
| -rw-r--r-- | sc/Library_vbaobj.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 44e09b645a5f..a3804e3e1a37 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -137,10 +137,12 @@ $(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 +#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255 ifeq ($(strip $(COM)),GCC) +gccthunkBroken := $(shell expr $(gb_CCVER) \>= 40500 \& $(gb_CCVER) \< 40700) +endif + +ifeq ($(gccthunkBroken),1) $(eval $(call gb_Library_add_cxxobjects,vbaobj,\ sc/source/ui/vba/vbasheetobjects \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ @@ -150,6 +152,7 @@ $(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 \ |