diff -r 48d025ecec3c -r f9d258cee458 sbsv2/raptor/lib/flm/e32abiv2stdexe.flm --- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Tue Mar 30 20:25:06 2010 +0100 +++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Wed Apr 07 12:26:04 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -35,7 +35,12 @@ LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) endif -STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB) +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