diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-11 11:34:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-12 16:20:29 +0000 |
| commit | e227d6141a9fedf4a35eb9ebee85fd7e09341bfe (patch) | |
| tree | b97d262ebaaabc285d4c25433112d4d4a9435147 /sc | |
| parent | 92f4c7418ff786146eb23a5a0b6bcaaec6ae7065 (diff) | |
sc: remove optimization disabling workaround for GCC 4.5 bug
... since we need newer GCC for C++11 anyway.
Change-Id: I5408d9066b9f1efec234fe05551fed2d8fb583ed
Reviewed-on: https://gerrit.libreoffice.org/11394
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/Library_vbaobj.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 00f31ad7c754..92d3e06d024f 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbapivottables \ 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 \ @@ -118,22 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbawsfunction \ )) -#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255 -ifeq ($(COM)-$(OS)-$(CPUNAME)$(COM_GCC_IS_CLANG),GCC-LINUX-INTEL) -sc_gccthunkBroken := $(shell expr $(GCC_VERSION) \>= 40500 \& $(GCC_VERSION) \< 40602) -endif - -ifeq ($(sc_gccthunkBroken),1) -$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ - sc/source/ui/vba/vbasheetobjects \ - , $(gb_COMPILERNOOPTFLAGS) $(if $(call gb_LinkTarget__debug_enabled,vbaobj),$(gb_DEBUG_CFLAGS)) $(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_use_system_win32_libs,vbaobj,\ advapi32 \ |