$OpenBSD: patch-svx_Library_svxcore_mk,v 1.5 2016/09/04 12:02:49 robert Exp $
--- svx/Library_svxcore.mk.orig.port	Fri Jul 29 00:11:19 2016
+++ svx/Library_svxcore.mk	Sat Sep  3 16:55:20 2016
@@ -104,7 +104,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,
 
 endif
 
-$(eval $(call gb_Library_add_exception_objects,svxcore,\
+$(eval $(call gb_Library_add_cxxobjects,svxcore,\
     svx/source/core/coreservices \
     svx/source/core/extedit \
     svx/source/core/graphichelper \
@@ -414,9 +414,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore
     svx/source/xoutdev/xtable \
     svx/source/xoutdev/XPropertyEntry \
     svx/source/xoutdev/xtablend \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,svxcore,\
+$(eval $(call gb_Library_add_cxxobjects,svxcore,\
     svx/source/fmcomp/dbaexchange \
     svx/source/fmcomp/fmgridcl \
     svx/source/fmcomp/fmgridif \
@@ -466,6 +467,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore
     svx/source/form/stringlistresource \
     svx/source/form/typemap \
     svx/source/form/xfm_addcondition \
+	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
 $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
