$OpenBSD: patch-svx_Library_svxcore_mk,v 1.1 2014/11/09 12:33:18 robert Exp $
--- svx/Library_svxcore.mk.orig.port	Sat Nov  8 23:14:39 2014
+++ svx/Library_svxcore.mk	Sun Nov  9 13:00:05 2014
@@ -89,7 +89,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	glew \
 ))
 
-$(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 \
@@ -389,9 +389,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 \
@@ -443,6 +444,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore
     svx/source/form/typeconversionclient \
     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))
