sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for gcc builds.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@178 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen
2006-05-16 15:29:48 +00:00
parent f3bf0db3e9
commit 9aae885601
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Tools/Source/TianoTools/GenFvImage/build.xml
View File

@@ -65,6 +65,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</echo> </echo>
</else> </else>
</if> </if>
<property name="ToolChain" value="gcc"/>
<if> <if>
<equals arg1="${ToolChain}" arg2="msvc"/> <equals arg1="${ToolChain}" arg2="msvc"/>
<then> <then>
@@ -82,6 +83,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</elseif> </elseif>
</if> </if>
<condition property="syslibdirs" value="">
<os family="mac"/>
</condition>
<condition property="syslibs" value="">
<os family="mac"/>
</condition>
<condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">
<os family="windows"/>
</condition>
<condition property="syslibs" value="uuid">
<os family="windows"/>
</condition>
<condition property="syslibdirs" value="/usr/lib">
<os name="Linux"/>
</condition>
<condition property="syslibs" value="uuid">
<os name="Linux"/>
</condition>
</target> </target>
<target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/> <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>
@@ -111,7 +136,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/> <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
<!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> --> <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
<syslibset libs="RpcRT4" unless="gcc"/> <syslibset libs="RpcRT4" unless="gcc"/>
</cc> </cc>
</target> </target>
@@ -143,7 +168,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/> <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
<!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> --> <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
<syslibset libs="RpcRT4" unless="gcc"/> <syslibset libs="RpcRT4" unless="gcc"/>
</cc> </cc>
</target> </target>
@@ -175,7 +200,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/> <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
<!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> --> <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
<syslibset libs="RpcRT4" unless="gcc"/> <syslibset libs="RpcRT4" unless="gcc"/>
</cc> </cc>
</target> </target>
@@ -207,7 +232,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
<linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/> <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>
<!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> --> <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>
<syslibset libs="RpcRT4" unless="gcc"/> <syslibset libs="RpcRT4" unless="gcc"/>
</cc> </cc>
</target> </target>

2
Tools/Source/TianoTools/MakeDeps/MakeDeps.c
View File

@@ -26,7 +26,7 @@ Abstract:
#include <ctype.h> #include <ctype.h>
#include <Base.h> #include <Base.h>
#include <UEfiBaseTypes.h> #include <UefiBaseTypes.h>
#include "EfiUtilityMsgs.h" #include "EfiUtilityMsgs.h"
#include <CommonLib.h> #include <CommonLib.h>