X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FVfrCompile%2Fbuild.xml;h=690d10ab8ea737a8855ec275de9cd1c6c4e5b9fa;hp=f6a08c83b2db0d0da4ba9542e552f69269bd140b;hb=96c0505b54e384b64961cbb32b91ff5d53d14f65;hpb=dce914c0d20c001d438e4fd13a9310ea44cb4d55

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index f6a08c83b2..690d10ab8e 100644
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -83,6 +83,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
 			</uptodate>
 		</condition>
+
+    <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
+      <os family="mac"/>
+	</condition>
+		
+    <condition property="gxx_extra_libs" value="stdc++">
+      <os name="linux"/>
+	</condition>
+		
+    <condition property="gxx_extra_libs" value="stdc++">
+      <os family="windows"/>
+	</condition>
+		
   </target>
 
   <target name="Antlr" depends="init" unless="CheckDepends">
@@ -93,12 +106,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   <target name="Dlg" depends="Antlr" unless="CheckDepends">
     <exec dir="${basedir}/${ToolName}" executable="dlg" failonerror="TRUE">
-      <arg line="-C2 -i -CC -o . Parser.dlg"/>
+      <arg line="-C2 -i -CC -o . parser.dlg"/>
     </exec>
   </target>
 
   <target name="Tool" depends="init, Dlg">
-    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+    <cc name="g++" objdir="${BUILD_DIR}" 
         outfile="${BIN_DIR}/${ToolName}"
         outtype="executable"
         optimize="speed">
@@ -116,7 +129,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
-      <syslibset libs="stdc++" if="gcc"/>
+      <syslibset libs="${gxx_extra_libs}" if="gcc"/>
     </cc>
   </target>