# HG changeset patch
# User Tom Cosgrove <tom.cosgrove@nokia.com>
# Date 1275060547 -3600
# Node ID 8aab599e3476298d23ac8bdb633c1d808fae389f
# Parent  42b870f996776873eef31208f276c08763b960c5
Fix for bug 2283 (RVCT 4.0 support is missing from PDK 3.0.h)
Have multiple extension sections in the bld.inf, one for each version
of the compiler.  The RVCT version building the tools will build the
runtime libraries for its version, but make sure we extract all the other
versions from zip archives.  Also add the archive for RVCT4.

diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/bld.inf
--- a/kernel/eka/compsupp/bld.inf	Sun May 09 23:01:41 2010 +0100
+++ b/kernel/eka/compsupp/bld.inf	Fri May 28 16:29:07 2010 +0100
@@ -29,47 +29,65 @@
 
 compsupp.iby                /epoc32/rom/include/
 
-// Unzip runtimes not being built
-
-#if !defined(ARMCC_2_2)
-:zip rt_2_2_export.zip
-#endif
-
-#if !defined(ARMCC_3_1)
-:zip rt_3_1_export.zip
-#endif
-
-#if !defined(ARMCC_4_0)
-:zip rt_4_0_export.zip
-#endif
-
 
 PRJ_MMPFILES
 
-#if !defined GCCXML && !defined GCCE
+#if !defined(GCCXML) && !defined(GCCE)
 
     symcpp/scppnwdl.mmp
     rvct/dfprvct-thunk.mmp
     rvct/usrt.mmp
     rvct/ksrt.mmp
 
-    #ifndef SMP // Only static libraries build for SMP.
+    #ifndef SMP // Don't build dynamic libraries for SMP.
+
+        rvct/drtaeabi.mmp
+
+        rvct/dfpaeabi.mmp
+        rvct/dfpaeabi_vfpv2.mmp
 
-    rvct/drtaeabi.mmp
+        #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
+
+            rvct/drtrvct.mmp
+            rvct/drtrvct_vfpv2.mmp
 
-    rvct/dfpaeabi.mmp
-    rvct/dfpaeabi_vfpv2.mmp
+            rvct/dfprvct.mmp
+            rvct/dfprvct_vfpv2.mmp
+
+        #endif
 
-    #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
+    #endif // #ifndef SMP
+
+#endif // #if !defined(GCCXML) && !defined(GCCE)
+
+
+PRJ_EXTENSIONS
+
+#if !defined(GCCXML) && !defined(GCCE)
 
-        rvct/drtrvct.mmp
-        rvct/drtrvct_vfpv2.mmp
+    // We need the runtime libraries for all versions of the compiler.
+    // The version we're running with will build its own runtime library;
+    // we need to extract the other versions from archives.
 
-        rvct/dfprvct.mmp
-        rvct/dfprvct_vfpv2.mmp
+    #ifndef ARMCC_2_2
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_2_2.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
     #endif
 
+    #ifndef ARMCC_3_1
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_3_1.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
     #endif
 
-#endif
+    #ifndef ARMCC_4_0
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_4_0.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
+    #endif
 
+#endif // #if !defined(GCCXML) && !defined(GCCE)
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_2_2.zip
Binary file kernel/eka/compsupp/rt_2_2.zip has changed
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_2_2_export.zip
Binary file kernel/eka/compsupp/rt_2_2_export.zip has changed
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_3_1.zip
Binary file kernel/eka/compsupp/rt_3_1.zip has changed
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_3_1_export.zip
Binary file kernel/eka/compsupp/rt_3_1_export.zip has changed
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_4_0.zip
Binary file kernel/eka/compsupp/rt_4_0.zip has changed
diff -r 42b870f99677 -r 8aab599e3476 kernel/eka/compsupp/rt_4_0_export.zip
Binary file kernel/eka/compsupp/rt_4_0_export.zip has changed