# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1276507031 -3600
# Node ID eb29190b8a370bc931095287be34696f0cab226d
# Parent  ec910f1bb750424a75d69c472a26c517f62c88d6
Revised GCCE workaround for Bug 2926 - must use :zip export to ensure that the various files are present
before any builds are attempted, otherwise there is "no rule to make usrt3_1.lib" and no
attempt is made to link any executables even after the extension makefiles are executed.

diff -r ec910f1bb750 -r eb29190b8a37 kernel/eka/compsupp/bld.inf
--- a/kernel/eka/compsupp/bld.inf	Sun Jun 13 10:15:35 2010 +0100
+++ b/kernel/eka/compsupp/bld.inf	Mon Jun 14 10:17:11 2010 +0100
@@ -29,6 +29,14 @@
 
 compsupp.iby                /epoc32/rom/include/
 
+#if defined(GCCE)
+// Workaround for GCCE builds
+// Export the generic binaries which are currently only built with RVCT
+
+:zip rt_generic_export.zip
+:zip rt_3_1_export.zip
+#endif
+
 
 PRJ_MMPFILES
 
@@ -87,16 +95,6 @@
 end
 #endif
 
-// Workaround for GCCE builds
-// Export the generic binaries which are currently only built with RVCT
-
-#if defined(GCCE)
-start extension tools/compsupp
-option  FILE  $(EXTENSION_ROOT)/rt_generic_export.zip
-option  TODIR $(EPOCROOT)
-end
-#endif
-
 #endif // #if !defined GCCXML