diff -r 28419e56ee8a -r 113d720d5a6c sbsv2/raptor/lib/flm/e32abiv2stdexe.flm --- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Mon Mar 15 11:38:03 2010 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Tue Mar 16 15:27:06 2010 +0000 @@ -35,6 +35,12 @@ LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) endif +ifeq ($(EPOCNESTEDEXCEPTIONS),) + STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB) +else + STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS) +endif + NAMEDSYMLKUP:=1 LIBRARY:=$(LIBRARY) euser.dso