Fix building issue for Mac OS

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

diff --git a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
index 1bd7b38f5497126e063ea212bb05d2d6a89fdb41..881251f03e521308da92a6fa393c4cb3ca66e67f 100644 (file)
--- a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
+++ b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
@@ -24,6 +24,12 @@ using namespace std;
 \r
 typedef UINT64 ulonglong_t;\r
 \r
+#ifdef __GNUC__\r
+#if __STDC_VERSION__ < 199901L\r
+#define __FUNCTION__ __FILE__\r
+#endif\r
+#endif\r
+\r
 template <class T>\r
 class CMemoryLeakChecker : public list<T*>\r
 {\r

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