--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Thu Apr 01 10:50:16 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Thu Apr 01 11:31:21 2010 +0100
@@ -50,6 +50,11 @@
 
 $(if $(FLMDEBUG),$(info <flm name='e32abiv2' target='$(TARGET)' type='$(TARGETTYPE)' outputpath='$(OUTPUTPATH)' metasource='$(METASOURCE)' postlinkfiletype='$(POSTLINKFILETYPE)' />))
 
+# Enable DELETE_ON_FAILED_COMPILE work around for failed RVCT 2.2 compiles
+ifneq ($(DELETE_ON_FAILED_COMPILE),)
+RVCT22_DELETE_WORKAROUND:=|| { $$(GNURM) $$@; exit 1; }
+endif # ifneq ($(DELETE_ON_FAILED_COMPILE),)
+
 # Strip switch-type parameters
 #
 POSTLINKTARGETTYPE:=$(strip $(POSTLINKTARGETTYPE))

--- a/sbsv2/raptor/lib/flm/globals.mk	Thu Apr 01 10:50:16 2010 +0100
+++ b/sbsv2/raptor/lib/flm/globals.mk	Thu Apr 01 11:31:21 2010 +0100
@@ -52,11 +52,6 @@
 $(eval $(call sgt_addcmds,$(1)))
 endef
 
-# Enable DELETE_ON_FAILED_COMPILE work around for failed RVCT 2.2 compiles
-ifneq ($(DELETE_ON_FAILED_COMPILE),)
-RVCT22_DELETE_WORKAROUND:=|| { $$(GNURM) $$@; exit 1; }
-endif # ifneq ($(DELETE_ON_FAILED_COMPILE),)
-
 ALLTARGET:=ALL
 
 .PHONY:: $(ALLTARGET)