Handle g++ libs correctly, since ant incorrectly does not use g++ as the linker,...

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

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index f6a08c83b2db0d0da4ba9542e552f69269bd140b..690d10ab8ea737a8855ec275de9cd1c6c4e5b9fa 100644 (file)
--- 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"/>\r
                        </uptodate>\r
                </condition>\r
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>\r
                        </uptodate>\r
                </condition>\r

+\r
+    <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">\r
+      <os family="mac"/>\r
+       </condition>\r
+               \r
+    <condition property="gxx_extra_libs" value="stdc++">\r
+      <os name="linux"/>\r
+       </condition>\r
+               \r
+    <condition property="gxx_extra_libs" value="stdc++">\r
+      <os family="windows"/>\r
+       </condition>\r
+               \r

   </target>\r
 \r
   <target name="Antlr" depends="init" unless="CheckDepends">\r
   </target>\r
 \r
   <target name="Antlr" depends="init" unless="CheckDepends">\r


@@ -93,12 +106,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <target name="Dlg" depends="Antlr" unless="CheckDepends">\r
     <exec dir="${basedir}/${ToolName}" executable="dlg" failonerror="TRUE">\r
 \r
   <target name="Dlg" depends="Antlr" unless="CheckDepends">\r
     <exec dir="${basedir}/${ToolName}" executable="dlg" failonerror="TRUE">\r

-      <arg line="-C2 -i -CC -o . Parser.dlg"/>\r
+      <arg line="-C2 -i -CC -o . parser.dlg"/>\r

     </exec>\r
   </target>\r
 \r
   <target name="Tool" depends="init, Dlg">\r
     </exec>\r
   </target>\r
 \r
   <target name="Tool" depends="init, Dlg">\r

-    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+    <cc name="g++" objdir="${BUILD_DIR}" \r

         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
         optimize="speed">\r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
         optimize="speed">\r


@@ -116,7 +129,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

-      <syslibset libs="stdc++" if="gcc"/>\r
+      <syslibset libs="${gxx_extra_libs}" if="gcc"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r