--- a/kernel/eka/compsupp/bld.inf	Mon Mar 08 11:58:34 2010 +0000
+++ b/kernel/eka/compsupp/bld.inf	Thu Mar 18 15:20:39 2010 +0000
@@ -59,19 +59,29 @@
 
 PRJ_EXTENSIONS
 
-// Unzip RVCT3.1 runtime if being built with RVCT2.2 or RVCT4.0
-
-start extension tools/compsupp
+// Export the compiler-specific support files built by this component
+// when using the other versions of RVCT
 
-#if defined(ARMCC_2_2) || defined(ARMCC_4_0)
-option  FILE  $(EXTENSION_ROOT)/rt_3_1.zip
-#elif defined(ARMCC_3_1)
-option  FILE  $(EXTENSION_ROOT)/rt_2_2.zip
+#if !defined(ARMCC_2_2)
+start extension tools/compsupp
+option  FILE  $(EXTENSION_ROOT)/rt_2_2_export.zip
+option  TODIR $(EPOCROOT)
+end
 #endif
 
-option  TODIR $(EPOCROOT)epoc32/release
+#if !defined(ARMCC_3_1)
+start extension tools/compsupp
+option  FILE  $(EXTENSION_ROOT)/rt_3_1_export.zip
+option  TODIR $(EPOCROOT)
+end
+#endif
 
+#if !defined(ARMCC_4_0)
+start extension tools/compsupp
+option  FILE  $(EXTENSION_ROOT)/rt_4_0_export.zip
+option  TODIR $(EPOCROOT)
 end
+#endif
 
 #endif // #if !defined GCCXML && !defined GCCE
 

Binary file kernel/eka/compsupp/rt_2_2.zip has changed

Binary file kernel/eka/compsupp/rt_2_2_export.zip has changed

Binary file kernel/eka/compsupp/rt_3_1.zip has changed

Binary file kernel/eka/compsupp/rt_3_1_export.zip has changed

Binary file kernel/eka/compsupp/rt_4_0_export.zip has changed