Support building on x64 hosts.

[mirror_edk2.git] / Tools / Source / TianoTools / build.xml

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index d5446f138d92e8de7befa88857166cf6b271208e..0d6d2fbc6f9f9559327c706591a89d02abd907ca 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -15,6 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env" />\r
+  <condition property="HostArch" value="x64">\r
+    <os arch="amd64"/>\r
+  </condition>\r
+  <condition property="HostArch" value="Ia32">\r
+    <os arch="x86"/>\r
+  </condition>\r
+  <condition property="HostArch" value="Ia32">\r
+    <os arch="i386"/>\r
+  </condition>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}" />\r
   <property name="WORKSPACE_DIR" value="${WORKSPACE}" />\r
   <property name="PACKAGE" value="Tools" />\r
@@ -22,6 +31,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="LIB_DIR" value="${PACKAGE_DIR}/Library" />\r
   <property name="BIN_DIR" value="${WORKSPACE}/Tools/bin" />\r
   <property name="BUILD_MODE" value="PACKAGE" />\r
+  <property name="Libs" \r
+    value="String/build.xml Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml"/>\r
 \r
   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />\r
 \r
@@ -63,8 +74,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </else>\r
     </if>\r
 \r
-    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />\r
-    \r
     <if>\r
         <isset property="env.TOOL_CHAIN" />\r
       <then>\r
@@ -79,6 +88,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os name="Linux"/>\r
     </condition>\r
     \r
+    <condition property="x86_64_linux">\r
+      <and>\r
+        <os name="Linux"/>\r
+        <equals arg1="${HostArch}" arg2="x64"/>\r
+      </and>\r
+    </condition>\r
+    \r
     <condition property="windows" value="true">\r
       <os family="Windows"/>\r
     </condition>\r
@@ -92,14 +108,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <target name="Libraries">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" \r
-        includes="Common/build.xml CustomizedCompress/build.xml"/>\r
+        includes="${Libs}"/>\r
     </subant>\r
   </target>\r
 \r
   <target name="Tools" depends="Libraries">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"\r
-        excludes="Common/build.xml CustomizedCompress/build.xml"/>\r
+        excludes="${Libs}"/>\r
     </subant>\r
   </target>\r
 \r