Handle g++ libs correctly, since ant incorrectly does not use g++ as the linker, we do this as a workaround.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@165 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen 2006-05-15 23:34:57 +00:00
parent 6dd1f283ca
commit 96c0505b54
1 changed files with 15 additions and 2 deletions

View File

@ -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"/> includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
</uptodate> </uptodate>
</condition> </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>
<target name="Antlr" depends="init" unless="CheckDepends"> <target name="Antlr" depends="init" unless="CheckDepends">
@ -98,7 +111,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</target> </target>
<target name="Tool" depends="init, Dlg"> <target name="Tool" depends="init, Dlg">
<cc name="${ToolChain}" objdir="${BUILD_DIR}" <cc name="g++" objdir="${BUILD_DIR}"
outfile="${BIN_DIR}/${ToolName}" outfile="${BIN_DIR}/${ToolName}"
outtype="executable" outtype="executable"
optimize="speed"> 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="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
<syslibset libs="stdc++" if="gcc"/> <syslibset libs="${gxx_extra_libs}" if="gcc"/>
</cc> </cc>
</target> </target>