diff -r a5741f22d0a5 -r 28419e56ee8a sbsv2/raptor/lib/flm/e32abiv2defaults.mk --- a/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Mar 08 14:05:10 2010 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Mar 15 11:38:03 2010 +0000 @@ -31,11 +31,15 @@ POSTLINKDEFFILE:= POSTLINKFILETYPE:= POSTLINKTARGETTYPE:= -STATIC_RUNTIME_LIB:= SUPPORT_FREEZE:= NOHIDEALL:= DEFAULT_NEWLIB:=$(DEFAULT_SYMBIAN_NEWLIB) +ifeq ($(EPOCNESTEDEXCEPTIONS),) +STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB) +else +STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS) +endif # Reset these variables as they change for every single target type # LINKER_ENTRYPOINT_ADORNMENT will be blank for GCCE; for RVCT it will look like "(uc_exe_.o)"