Streamline the tools build and make it friendlier to gcc.

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

diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index cbdd04a0c867d088e9da4412499bbd649472a93f..a432c86cc09cbec7b9dbd053bc1acc0f70066f75 100644 (file)
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -67,8 +67,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                               <property name="MSVC_DIR" value="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/Include" />\r
-                               <property name="MSVC_SDK_DIR" value="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Include" />\r
                        </then>\r
                        <elseif>\r
                          <equals arg1="${ToolChain}" arg2="gcc"/>\r
@@ -85,29 +83,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
-        includes="${FileSet}" \r
-        defaultexcludes="TRUE" \r
-        excludes="*.xml *.inf"/>\r
+        includes="${FileSet}"/>\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
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-                       <linkerarg value="${LIB_DIR}/CommonTools${ext_static}"/>\r
+                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \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}/${ToolName}${ext_exe}"/>\r
-        </exec>\r
-      </then>\r
-    </if>\r
   </target>\r
 \r
   <target name="clean" depends="init">\r