diff options
| author | bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-05-15 23:34:57 +0000 |
|---|---|---|
| committer | bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-05-15 23:34:57 +0000 |
| commit | 96c0505b54e384b64961cbb32b91ff5d53d14f65 (patch) | |
| tree | 50309381bc66387708e26cf9834b922307e94004 | |
| parent | 6dd1f283ca76c346e056c98b0b074eb7e2a6d253 (diff) | |
| download | edk2-platforms-96c0505b54e384b64961cbb32b91ff5d53d14f65.tar.xz | |
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
| -rw-r--r-- | Tools/Source/TianoTools/VfrCompile/build.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml index 7c48298484..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">
@@ -98,7 +111,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. </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>
|