automation/Library_sts.mk | 7 +-- canvas/Library_vclcanvas.mk | 12 +---- dbaccess/Library_dbui.mk | 24 ++++------ framework/Library_fwk.mk | 12 +++-- sc/Library_sc.mk | 99 +++++++++++++++++++------------------------- sc/Library_scfilt.mk | 10 +--- sd/Library_sd.mk | 25 ++++------- sd/Library_sdfilt.mk | 10 +--- set_soenv.in | 2 sfx2/Library_sfx.mk | 10 +--- solenv/gbuild/LinkTarget.mk | 8 +-- svx/Library_svxcore.mk | 13 ++--- 12 files changed, 96 insertions(+), 136 deletions(-)
New commits: commit 53d9f415b2985f3784fabc9e72c3b486dad5efc8 Author: Don Lewis <[email protected]> Date: Fri Dec 15 14:54:32 2017 +0000 Enhance gb_LinkTarget_set_*_optimization functions to allow multiple targets to be specified. Convert optimization overrides in the gbuild library makefiles to use gb_LinkTarget_set_*_optimization. There should be no functional change. diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk index 16a4af320ca8..5c2bf76d454a 100644 --- a/automation/Library_sts.mk +++ b/automation/Library_sts.mk @@ -94,12 +94,11 @@ endif $(eval $(call gb_Library_add_exception_objects,sts,\ automation/source/server/XMLParser \ automation/source/server/server \ -)) - -$(eval $(call gb_Library_add_cxxobjects,sts,\ automation/source/server/statemnt \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + automation/source/server/statement, $(gb_COMPILERNOOPTFLAGS) \ +)) # vim: set noet sw=4 ts=4: diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 0213ac0d1c82..3bcdffdefbb6 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/canvascustomsprite \ canvas/source/vcl/canvasfont \ canvas/source/vcl/canvashelper \ + canvas/source/vcl/canvashelper_texturefill \ canvas/source/vcl/devicehelper \ canvas/source/vcl/impltools \ canvas/source/vcl/services \ @@ -80,14 +81,9 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ )) # Solaris Sparc with Sun Compiler: noopt -ifneq ($(strip($OS)),SOLARIS) -$(eval $(call gb_Library_add_exception_objects,vclcanvas,\ - canvas/source/vcl/canvashelper_texturefill \ -)) -else -$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\ - canvas/source/vcl/canvashelper_texturefill \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +ifeq ($(strip($OS)),SOLARIS) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + canvas/source/vcl/canvashelper_texturefill, $(gb_COMPILERNOOPTFLAGS) \ )) endif diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index e3e68cce0947..7a0adb992bdc 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/uno/UserSettingsDlg \ dbaccess/source/ui/uno/admindlg \ dbaccess/source/ui/uno/composerdialogs \ + dbaccess/source/ui/uno/copytablewizard \ dbaccess/source/ui/uno/dbinteraction \ dbaccess/source/ui/uno/textconnectionsettings_uno \ dbaccess/source/ui/uno/unoDirectSql \ @@ -276,6 +277,15 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ dbaccess/source/ui/uno/unosqlmessage \ )) +# the following source file can't be compiled with optimization by some compilers (crash or endless loop): +# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC +# the latter is currently not supported by gbuild and needs a fix here later +ifneq ($(COM),$(filter-out GCC,$(COM))) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + dbaccess/source/ui/uno/copytablewizard, $(gb_COMPILERNOOPTFLAGS) \ +)) +endif + $(eval $(call gb_Library_add_noexception_objects,dbui, \ dbaccess/source/shared/dbu_reghelper \ dbaccess/source/shared/dbustrings \ @@ -299,18 +309,4 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \ dbaccess/source/ui/querydesign/TableFieldInfo \ )) -# the following source file can't be compiled with optimization by some compilers (crash or endless loop): -# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC -# the latter is currently not supported by gbuild and needs a fix here later -ifeq ($(COM),$(filter-out GCC,$(COM))) -$(eval $(call gb_Library_add_exception_objects,dbui,\ - dbaccess/source/ui/uno/copytablewizard \ -)) -else -$(eval $(call gb_Library_add_cxxobjects,dbui,\ - dbaccess/source/ui/uno/copytablewizard \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 449800331fce..bfcf494d50e6 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -61,11 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ $(gb_STDLIBS) \ )) -# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX -ifeq ($(OS),MACOSX) - $(call gb_LinkTarget_set_cxx_optimization,framework/source/loadenv/loadenv,$(gb_COMPILEROPT1FLAGS)) -endif - $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ @@ -195,4 +190,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/xml/imagesdocumenthandler \ )) +# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX +ifeq ($(OS),MACOSX) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 90f784d8883f..f9200b4ca991 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -133,14 +133,19 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/view/tabview4 \ sc/source/ui/view/tabview5 \ sc/source/ui/view/viewfunc \ + sc/source/ui/view/viewfun2 \ sc/source/ui/view/viewfun3 \ + sc/source/ui/view/viewfun4 \ sc/source/ui/view/viewfun5 \ sc/source/ui/view/viewfun6 \ sc/source/ui/view/viewfun7 \ sc/source/ui/view/dbfunc \ + sc/source/ui/view/dbfunc2 \ sc/source/ui/view/dbfunc3 \ sc/source/ui/view/dbfunc4 \ + sc/source/ui/view/drawview \ sc/source/ui/view/tabvwsh \ + sc/source/ui/view/tabvwsh2 \ sc/source/ui/view/tabvwsh3 \ sc/source/ui/view/tabvwsh4 \ sc/source/ui/view/tabvwsh5 \ @@ -265,6 +270,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/drawfunc/fupoor \ sc/source/ui/drawfunc/fumark \ sc/source/ui/drawfunc/fudraw \ + sc/source/ui/drawfunc/fusel \ sc/source/ui/drawfunc/fusel2 \ sc/source/ui/drawfunc/fuconstr \ sc/source/ui/drawfunc/fuconrec \ @@ -303,6 +309,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/navipi/navcitem \ sc/source/ui/navipi/scenwnd \ sc/source/ui/navipi/content \ + sc/source/ui/unoobj/cellsuno \ sc/source/ui/unoobj/docuno \ sc/source/ui/unoobj/servuno \ sc/source/ui/unoobj/defltuno \ @@ -323,6 +330,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/unoobj/datauno \ sc/source/ui/unoobj/dapiuno \ sc/source/ui/unoobj/chartuno \ + sc/source/ui/unoobj/chart2uno \ sc/source/ui/unoobj/shapeuno \ sc/source/ui/unoobj/pageuno \ sc/source/ui/unoobj/forbiuno \ @@ -349,15 +357,20 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attrib \ sc/source/core/data/autonamecache \ sc/source/core/data/bcaslot \ + sc/source/core/data/cell \ sc/source/core/data/cell2 \ sc/source/core/data/clipparam \ sc/source/core/data/column \ + sc/source/core/data/column2 \ + sc/source/core/data/column3 \ sc/source/core/data/compressedarray \ + sc/source/core/data/conditio \ sc/source/core/data/dbdocutl \ sc/source/core/data/dociter \ sc/source/core/data/docpool \ sc/source/core/data/documen2 \ sc/source/core/data/documen3 \ + sc/source/core/data/documen4 \ sc/source/core/data/documen5 \ sc/source/core/data/documen6 \ sc/source/core/data/documen7 \ @@ -400,11 +413,14 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/tabbgcolor \ sc/source/core/data/table1 \ sc/source/core/data/table2 \ + sc/source/core/data/table3 \ + sc/source/core/data/table4 \ sc/source/core/data/table5 \ sc/source/core/data/table6 \ sc/source/core/data/tabprotection \ sc/source/core/data/userdat \ sc/source/core/data/postit \ + sc/source/core/data/validat \ sc/source/core/tool/addincfg \ sc/source/core/tool/addincol \ sc/source/core/tool/addinhelpid \ @@ -416,6 +432,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/callform \ sc/source/core/tool/cellform \ sc/source/core/tool/cellkeytranslator \ + sc/source/core/tool/chartarr \ sc/source/core/tool/charthelper \ sc/source/core/tool/chartpos \ sc/source/core/tool/chartlis \ @@ -437,8 +454,11 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/hints \ sc/source/core/tool/inputopt \ sc/source/core/tool/interpr1 \ + sc/source/core/tool/interpr2 \ sc/source/core/tool/interpr3 \ + sc/source/core/tool/interpr4 \ sc/source/core/tool/interpr5 \ + sc/source/core/tool/interpr6 \ sc/source/core/tool/lookupcache \ sc/source/core/tool/navicfg \ sc/source/core/tool/odffmap \ @@ -459,7 +479,9 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/reftokenhelper \ sc/source/core/tool/refupdat \ sc/source/core/tool/scmatrix \ + sc/source/core/tool/subtotal \ sc/source/core/tool/stringutil \ + sc/source/core/tool/token \ sc/source/core/tool/unitconv \ sc/source/core/tool/userlist \ sc/source/core/tool/viewopti \ @@ -474,6 +496,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/filter/xml/xmlrowi \ sc/source/filter/xml/xmlcelli \ sc/source/filter/xml/xmlconti \ + sc/source/filter/xml/xmlcvali \ sc/source/filter/xml/xmlcoli \ sc/source/filter/xml/xmlsubti \ sc/source/filter/xml/xmlnexpi \ @@ -538,90 +561,56 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/Accessibility/AccessibleCsvControl \ )) -$(eval $(call gb_Library_add_cxxobjects,sc,\ - sc/source/ui/view/drawview \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sc/source/filter/xml/xmlcvali \ + sc/source/ui/drawfunc/fusel \ sc/source/ui/view/dbfunc2 \ + sc/source/ui/view/drawview \ sc/source/ui/view/tabvwsh2 \ - sc/source/ui/drawfunc/fusel \ - sc/source/filter/xml/xmlcvali \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ + , $(gb_COMPILERNOOPTFLAGS) \ )) - + ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCPOWERPC) -$(eval $(call gb_Library_add_cxxobjects,sc,\ - sc/source/core/tool/subtotal \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/tool/subtotal \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sc/source/core/tool/subtotal, $(gb_COMPILERNOOPTFLAGS) \ )) endif ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCSPARC) -$(eval $(call gb_Library_add_cxxobjects,sc,\ - sc/source/ui/view/viewfun4 \ - sc/source/ui/view/viewfun2 \ - sc/source/ui/unoobj/cellsuno \ - sc/source/core/data/column2 \ - sc/source/core/data/column3 \ - sc/source/core/data/table3 \ - sc/source/core/data/table4 \ - sc/source/core/data/documen4 \ - sc/source/core/data/conditio \ - sc/source/core/data/validat \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ sc/source/core/data/cell \ - sc/source/core/tool/interpr2 \ - sc/source/core/tool/interpr4 \ - sc/source/core/tool/token \ - sc/source/core/tool/chartarr \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/ui/view/viewfun4 \ - sc/source/ui/view/viewfun2 \ - sc/source/ui/unoobj/cellsuno \ sc/source/core/data/column2 \ sc/source/core/data/column3 \ + sc/source/core/data/conditio \ + sc/source/core/data/documen4 \ sc/source/core/data/table3 \ sc/source/core/data/table4 \ - sc/source/core/data/documen4 \ - sc/source/core/data/conditio \ sc/source/core/data/validat \ - sc/source/core/data/cell \ + sc/source/core/tool/chartarr \ sc/source/core/tool/interpr2 \ sc/source/core/tool/interpr4 \ - sc/source/core/tool/token \ - sc/source/core/tool/chartarr \ + sc/source/core/tool/token + sc/source/ui/unoobj/cellsuno \ + sc/source/ui/view/viewfun2 \ + sc/source/ui/view/viewfun4 \ + , $(gb_COMPILERNOOPTFLAGS) \ )) endif ifeq ($(GUI),OS2) -$(eval $(call gb_Library_add_cxxobjects,sc,\ - sc/source/core/tool/interpr6 \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/tool/interpr6 \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sc/source/core/tool/interpr6, $(gb_COMPILERNOOPTFLAGS) \ )) endif # Work around bug in gcc 4.2 / 4.3, see # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35182 ifeq ($(COM),GCC) -$(eval $(call gb_Library_add_cxxobjects,sc,\ - sc/source/ui/unoobj/chart2uno \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/ui/unoobj/chart2uno \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sc/source/ui/unoobj/chart2uno, $(gb_COMPILERNOOPTFLAGS) \ )) endif - $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index b2a0804d64c3..4c59f6abd823 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -105,6 +105,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/excel/xeview \ sc/source/filter/excel/xichart \ sc/source/filter/excel/xicontent \ + sc/source/filter/excel/xiescher \ sc/source/filter/excel/xiformula \ sc/source/filter/excel/xihelper \ sc/source/filter/excel/xilink \ @@ -163,13 +164,8 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ )) ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCSPARC) -$(eval $(call gb_Library_add_cxxobjects,scfilt,\ - sc/source/filter/excel/xiescher \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,scfilt,\ - sc/source/filter/excel/xiescher \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sc/source/filter/excel/xiescher, $(gb_COMPILERNOOPTFLAGS) \ )) endif diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index bb2910819c20..215edfaac6d7 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -152,6 +152,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/ViewTabBar \ sd/source/ui/view/WindowUpdater \ sd/source/ui/view/viewoverlaymanager \ + sd/source/ui/app/optsitem \ sd/source/ui/app/sdmod \ sd/source/ui/app/sdmod1 \ sd/source/ui/app/sdmod2 \ @@ -258,6 +259,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/unoidl/unopback \ sd/source/ui/unoidl/unodoc \ sd/source/ui/unoidl/unomodule \ + sd/source/ui/unoidl/unowcntr \ sd/source/ui/unoidl/randomnode \ sd/source/ui/animations/CustomAnimationCreateDialog \ sd/source/ui/animations/CustomAnimationDialog \ @@ -295,6 +297,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/func/undolayer \ sd/source/ui/func/fupoor \ sd/source/ui/func/fudraw \ + sd/source/ui/func/futext \ sd/source/ui/func/fuzoom \ sd/source/ui/func/fusel \ sd/source/ui/func/fuconstr \ @@ -473,26 +476,16 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC # the latter is currently not supported by gbuild and needs a fix here later ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_cxxobjects,sd,\ - sd/source/ui/app/optsitem \ - sd/source/ui/func/futext \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sd,\ - sd/source/ui/app/optsitem \ - sd/source/ui/func/futext \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sd/source/ui/app/optsitem \ + sd/source/ui/func/futext \ + , $(gb_COMPILERNOOPTFLAGS) \ )) endif ifeq ($(COM),GCC) -$(eval $(call gb_Library_add_cxxobjects,sd,\ - sd/source/ui/unoidl/unowcntr \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sd,\ - sd/source/ui/unoidl/unowcntr \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sd/source/ui/unoidl/unowcntr, $(gb_COMPILERNOOPTFLAGS) \ )) endif diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 4cbc0a7fa0cc..9fd283c3e1d8 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_exception_objects,sdfilt,\ sd/source/filter/ppt/pptatom \ sd/source/filter/ppt/ppt97animations \ sd/source/filter/eppt/eppt \ + sd/source/filter/eppt/epptso \ sd/source/filter/eppt/escherex \ sd/source/filter/eppt/pptexanimations \ sd/source/filter/eppt/pptexsoundcollection \ @@ -72,13 +73,8 @@ $(eval $(call gb_Library_add_exception_objects,sdfilt,\ # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC # the latter is currently not supported by gbuild and needs a fix here later ifeq ($(COM),GCC) -$(eval $(call gb_Library_add_cxxobjects,sdfilt,\ - sd/source/filter/eppt/epptso \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sdfilt,\ - sd/source/filter/eppt/epptso \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sd/source/filter/eppt/epptso, $(gb_COMPILERNOOPTFLAGS) \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ec1f9dad35c7..791520b3c0ce 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -128,6 +128,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/config/evntconf \ sfx2/source/control/bindings \ sfx2/source/control/ctrlitem \ + sfx2/source/control/dispatch \ sfx2/source/control/macro \ sfx2/source/control/minfitem \ sfx2/source/control/msg \ @@ -278,13 +279,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ # "opening stylist, select graphic style, select modify from context menu, cancel dialog, close stylist" # only on unxlngi6 and unxlngi6.pro platform ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_cxxobjects,sfx,\ - sfx2/source/control/dispatch \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/control/dispatch \ +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + sfx2/source/control/dispatch, $(gb_COMPILERNOOPTFLAGS) \ )) endif diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index faa7c2863ff8..41d4bac5776e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -480,19 +480,19 @@ endif endef define gb_LinkTarget_set_c_optimization -$(call gb_CObject_get_target,$(1)) : CFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CFLAGS)) $(2) +$(foreach object,$(1),$(eval $(call gb_CObject_get_target,$(object)) : CFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CFLAGS)) $(2))) endef define gb_LinkTarget_set_cxx_optimization -$(call gb_CxxObject_get_target,$(1)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2) +$(foreach object,$(1),$(eval $(call gb_CxxObject_get_target,$(object)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2))) endef define gb_LinkTarget_set_gencxx_optimization -$(call gb_GenCxxObject_get_target,$(1)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2) +$(foreach object,$(1),$(eval $(call gb_GenCxxObject_get_target,$(object)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2))) endef define gb_LinkTarget_set_objcxx_optimization -$(call gb_ObjCxxObject_get_target,$(1)) : OBJCXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(OBJCXXFLAGS)) $(2) +$(foreach object,$(1),$(eval $(call gb_ObjCxxObject_get_target,$(object)) : OBJCXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(OBJCXXFLAGS)) $(2))) endef define gb_LinkTarget_set_include diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index bcff5277b4cd..49f1101dee24 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -89,6 +89,7 @@ $(call gb_Library_use_external,svxcore,icuuc) $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/core/coreservices \ svx/source/customshapes/EnhancedCustomShape2d \ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ svx/source/customshapes/EnhancedCustomShapeGeometry \ svx/source/customshapes/EnhancedCustomShapeTypeNames \ svx/source/dialog/checklbx \ @@ -441,14 +442,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ # the following source file can't be compiled with optimization by some compilers (crash or endless loop): # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC # the latter is currently not supported by gbuild and needs a fix here later -ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS))) -$(eval $(call gb_Library_add_exception_objects,svxcore,\ - svx/source/customshapes/EnhancedCustomShapeFunctionParser \ -)) -else -$(eval $(call gb_Library_add_cxxobjects,svxcore,\ - svx/source/customshapes/EnhancedCustomShapeFunctionParser \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +ifneq ($(OS),$(filter-out SOLARIS MACOSX,$(OS))) +$(eval $(call gb_LinkTarget_set_cxx_optimization, \ + svx/source/customshapes/EnhancedCustomShapeFunctionParser, \ + $(gb_COMPILERNOOPTFLAGS) \ )) endif commit 14f7045e998e64589483fa99b06bb4805477dad3 Author: Yuri Dario <[email protected]> Date: Fri Dec 15 14:19:56 2017 +0000 #i126518# Reverse-merging r1818128 into 'set_soenv.in' diff --git a/set_soenv.in b/set_soenv.in index c78b2a1e57d2..6ec61c6be3c2 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -358,7 +358,7 @@ elsif ( $platform =~ m/kfreebsd/ ) } elsif ( $platform =~ m/freebsd/ ) { $BIG_SVX = "TRUE"; - $COM = "GCC"; + $COM = "@COM_IS@"; $COMPATH = '@COMPATH@' . '/bin'; $CVER = "C300"; $GUI = "UNX"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
