# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1268313626 0
# Node ID 996297fad80090bce2524fd821d0439803e89262
# Parent  3118cfa874e0053ca8507365cf5c5c6590ab0c98# Parent  ebd555518364b2e18a7e0f0deb08774970be0bad
Catchup merge

diff -r 3118cfa874e0 -r 996297fad800 sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Mon Mar 08 20:00:46 2010 +0000
+++ b/sf-platform/compile.ant.xml	Thu Mar 11 13:20:26 2010 +0000
@@ -24,10 +24,7 @@
        note: must be called from sf-os/s60-compile targets, as sys model input needed -->
   <target name="sf-do-compile">
     <echo message="INFO Using Helium 7+ for sf-do-compile"/>
-    
-    <!-- Export model to BOM, as generate-layers target is no longer called from compile-main target -->
-    <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configurations.list}.xml" todir="${build.log.dir}/BOM/"/>
-    
+        
     <propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
   
     <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->
@@ -53,6 +50,9 @@
       <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true">
           <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.config}" />
       </antcall>
+  
+      <!-- Export model to BOM, as generate-layers target is no longer called from compile-main target -->
+      <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configurations.list}.xml" todir="${build.log.dir}/BOM/"/>
   </target>