Support building on x64 hosts.

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

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index 593db567b3de9e12bc44c1a2a3b3db45a9802b32..5351eebe0923c0db9632aba3369dff75ca18ee1b 100644 (file)
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -60,47 +60,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${LIB_DIR}/CommonTools"\r
         outtype="static"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
+      <compilerarg value="-fPIC" if="x86_64_linux"/>\r
 \r
-      <fileset dir="${basedir}/Common" \r
-        includes="*.h *.c" \r
-        defaultexcludes="TRUE" \r
-        excludes="*.xml *.inf"/>\r
+      <includepath path="${PACKAGE_DIR}/Include"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
 \r
+      <fileset dir="${basedir}/Common" \r
+        includes="*.c" />\r
     </cc>\r
-    <if>\r
-      <os family="dos"/>\r
-      <then>\r
-        <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">\r
-          <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CommonTools${ext_static}"/>\r
-        </exec>\r
-      </then>\r
-    </if>\r
   </target>\r
 \r
   <target name="clean" depends="init">\r
@@ -112,7 +101,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <target name="cleanall" depends="init">\r
     <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
+    <delete dir="${BUILD_DIR}" failonerror="false">\r
       <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>\r
     </delete>\r
   </target>\r