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 56535944a047ec9b2ea522b4e754839c3f3fce57..5351eebe0923c0db9632aba3369dff75ca18ee1b 100644 (file)
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -60,20 +60,20 @@ 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
@@ -82,9 +82,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outtype="static"\r
         optimize="speed">\r
 \r
+      <compilerarg value="-fPIC" if="x86_64_linux"/>\r
+\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
 \r
       <fileset dir="${basedir}/Common" \r
         includes="*.c" />\r