dbaccess/Library_dbui.mk | 9 +++++++++ svx/Library_svxcore.mk | 9 +++++++++ 2 files changed, 18 insertions(+)
New commits: commit 943443f350b571beb4e9c932067456e415ffa8fb Author: Don Lewis <truck...@apache.org> Date: Tue Apr 17 16:59:48 2018 +0000 Fix build with gcc 4.9 by tweaking optimization options for two files. This is a workaround for: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009> diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 7a0adb992bdc..885fcc5c6b05 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -286,6 +286,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \ )) endif +# g++49 -Os sometimes leaves inline class methods undefined, +# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009> +ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 000400090000 '&' $(CCNUMVER) '<' 000500000000),GCC1) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + dbaccess/source/ui/uno/ColumnControl, \ + $(gb_COMPILEROPTFLAGS) -fno-devirtualize -fno-devirtualize-speculatively \ +)) +endif + $(eval $(call gb_Library_add_noexception_objects,dbui, \ dbaccess/source/shared/dbu_reghelper \ dbaccess/source/shared/dbustrings \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 49f1101dee24..de5133ab6905 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -449,6 +449,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \ )) endif +# g++49 -Os sometimes leaves inline class methods undefined, +# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009> +ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 000400090000 '&' $(CCNUMVER) '<' 000500000000),GCC1) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + svx/source/fmcomp/fmgridif, \ + $(gb_COMPILEROPTFLAGS) -fno-devirtualize -fno-devirtualize-speculatively \ +)) +endif + $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits