Skip to content

Commit

Permalink
Fix the UnixPkg default to have the tools come from a seperate BaseTo…
Browse files Browse the repository at this point in the history
…ols project. When the fixes are checked into edk2 we can move it back to pointing to tools in edk2.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9538 6f19259b-4bc3-4df7-8a09-765794883524
  • Loading branch information
ajfish committed Dec 8, 2009
1 parent ecd3d59 commit b395a08
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@
objectVersion = 45;
objects = {

/* Begin PBXFileReference section */
F27EDBED101FA6FC0097B575 /* PciIoKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PciIoKit.h; path = ../../Sec/PciIoKit.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXGroup section */
08FB7794FE84155DC02AAC07 /* xcode_project */ = {
isa = PBXGroup;
children = (
F27EDBED101FA6FC0097B575 /* PciIoKit.h */,
);
name = xcode_project;
sourceTree = "<group>";
Expand Down
9 changes: 7 additions & 2 deletions UnixPkg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ if [ -z "$WORKSPACE" ]
then
echo Initializing workspace
cd ..
export EDK_TOOLS_PATH=`pwd`/BaseTools
# This version is for the tools in the BaseTools project.
# this assumes svn pulls have the same root dir
export EDK_TOOLS_PATH=`pwd`/../BaseTools
# This version is for the tools source in edk2
# export EDK_TOOLS_PATH=`pwd`/BaseTools
echo $EDK_TOOLS_PATH
source edksetup.sh BaseTools
else
Expand Down Expand Up @@ -90,7 +94,8 @@ done
#
echo $PATH
echo `which build`
build -p $WORKSPACE/EdkShellPkg/EdkShellPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
# Uncomment this if you want to build the shell.
#build -p $WORKSPACE/EdkShellPkg/EdkShellPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
build -p $WORKSPACE/UnixPkg/UnixPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
exit $?

0 comments on commit b395a08

Please sign in to comment.