Fix building issue for VC compiler. And enable GenFvMap in building CCode package.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2168 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/CCode/Source/GenFvMap/build.xml b/Tools/CCode/Source/GenFvMap/build.xml
index 0d05b58e874ffd45dddb3e560f4b3b7ee59b079b..cf8e34c1208e59f8daf88d510ca1a89a270d4630 100644 (file)
--- a/Tools/CCode/Source/GenFvMap/build.xml
+++ b/Tools/CCode/Source/GenFvMap/build.xml
@@ -54,7 +54,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <compilerarg value="-x" if="gcc"/>\r
       <compilerarg value="c++" if="gcc"/>\r
       <compilerarg value="/EHsc" unless="gcc"/>\r
-      <compilerarg value="/Za" unless="gcc"/>\r
       \r
       \r
       <fileset dir="${basedir}/${ToolName}"\r

diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index bdd163a19409fc50e67aa2d95c3d52fe07b4f4de..528fd7f6e37f0589a6216e715c7f3078cce20b74 100644 (file)
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -253,7 +253,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <target name="Tools" depends="Libraries">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml" \r
-        excludes="${Libs} GenFvMap/build.xml"/>\r
+        excludes="${Libs}"/>\r
     </subant>\r
   </target>\r
 \r