X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FCCode%2FSource%2Fbuild.xml;h=528fd7f6e37f0589a6216e715c7f3078cce20b74;hp=bbe545606f10cabdd40d824fc9afb6a5e1cf61ce;hb=9fae0373b02b13a467063a8fc88e6b34c9c9371e;hpb=ecb33821f56c17d9cc26fd8e66c2a15eea9dbcf1

diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index bbe545606f..528fd7f6e3 100644
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -35,21 +35,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>
   </path>
 
-  <taskdef classpathref="classpath" resource="GenBuild.tasks" />
   <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />
 
-  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
-  <typedef classpathref="classpath" resource="cpptasks.types"/>
 
-  <target name="all" depends="init, Tools">
+  <target name="all" depends="initArch, init, Tools">
     <echo message="The EDK II C Tools build complete!"/>
   </target>
   
   <target name="init">
     <echo message="EDK C Code Tools, build initialization"/>
+    <taskdef classpathref="classpath" resource="GenBuild.tasks" />
+    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
+    <typedef classpathref="classpath" resource="cpptasks.types"/>
     <mkdir dir="${BIN_DIR}" />
     <mkdir dir="${LIB_DIR}" />
 
+  </target>
+
+  <target name="initArch">
     <condition property="HostArch" value="X64">
       <os arch="amd64"/>
     </condition>
@@ -240,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>
   </target>
 
-  <target name="Libraries" depends="init">
+  <target name="Libraries" depends="initArch, init">
     <subant target="" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" 
         includes="${Libs}"/>
@@ -249,18 +252,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   <target name="Tools" depends="Libraries">
     <subant target="" inheritall="true">
-      <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"
+      <fileset dir="${PACKAGE_DIR}" includes="*/build.xml" 
         excludes="${Libs}"/>
     </subant>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean" depends="initArch">
     <subant target="clean" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>
   </target>
 
-  <target name="cleanall" depends="init">
+  <target name="cleanall" depends="initArch">
     <subant target="cleanall" inheritall="true">
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
     </subant>