diff -r 90be37e95e2f -r 3effbd6728d4 sf-platform/build.xml
--- a/sf-platform/build.xml	Thu Oct 08 19:37:59 2009 +0100
+++ b/sf-platform/build.xml	Fri Oct 09 17:01:52 2009 +0100
@@ -159,7 +159,7 @@
     ==         - job_refs.ant.xml
     ==
     -->
-  <target name="sf-os-compile">
+  <target name="sf-os-compile" depends="sf-compile-options">
 
         <hlm:argSet id="sbs.tools2.var">
                 <hlm:arg name="config" value="tools2_rel.whatlog" />
@@ -207,9 +207,6 @@
 		<hlm:arg name="command" value="WHAT" />
         </hlm:argSet>
 
-        <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
-        <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
-
 		<!-- generate baseline dir list to allow delta creation -->
 		<if><isset property="sf.os.compile.fast"/>
 			<then>
@@ -375,7 +372,7 @@
     ==         - job_refs.ant.xml
     ==
     -->
-  <target name="sf-s60-compile">
+  <target name="sf-s60-compile" depends="sf-compile-options">
 
         <hlm:argSet id="sbs.tools.var">
           			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />