Fix issue where the script assumed tools are in Bin, but they are still in BinWrappers with binaries in bin dir for all architectures. Make both schemes work.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9828 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2010-01-27 00:49:19 +00:00
parent d9dd98f0dc
commit 2a8ecdd0e1
1 changed files with 7 additions and 2 deletions

View File

@ -57,8 +57,13 @@ BUILD_ROOT_ARCH=$WORKSPACE/Build/Unix/DEBUG_"$TARGET_TOOLS"/IA32
if [[ ! -f `which build` || ! -f `which GenFv` ]]; if [[ ! -f `which build` || ! -f `which GenFv` ]];
then then
# build the tools if they don't yet exist # build the tools if they don't yet exist. Bin scheme
echo Building tools echo Building tools as they are not in the path
make -C $WORKSPACE/BaseTools
elif [[ ( -f `which build` || -f `which GenFv` ) && ! -d $EDK_TOOLS_PATH/Source/C/bin ]];
then
# build the tools if they don't yet exist. BinWrapper scheme
echo Building tools no $EDK_TOOLS_PATH/Source/C/bin directory
make -C $WORKSPACE/BaseTools make -C $WORKSPACE/BaseTools
else else
echo using prebuilt tools echo using prebuilt tools