diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-01-27 00:49:19 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-01-27 00:49:19 +0000 |
| commit | 2a8ecdd0e106a30c9c298b5ef750e1b0b9bf6b62 (patch) | |
| tree | 011423497c49240743e974e210ae68971fb07dd4 | |
| parent | d9dd98f0dc8edf4f5c86f44db046bf4aa4c95eda (diff) | |
| download | edk2-2a8ecdd0e106a30c9c298b5ef750e1b0b9bf6b62.zip edk2-2a8ecdd0e106a30c9c298b5ef750e1b0b9bf6b62.tar.gz edk2-2a8ecdd0e106a30c9c298b5ef750e1b0b9bf6b62.tar.bz2 | |
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
| -rwxr-xr-x | UnixPkg/build.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/UnixPkg/build.sh b/UnixPkg/build.sh index 64c9722..851e59f 100755 --- a/UnixPkg/build.sh +++ b/UnixPkg/build.sh @@ -57,8 +57,13 @@ BUILD_ROOT_ARCH=$WORKSPACE/Build/Unix/DEBUG_"$TARGET_TOOLS"/IA32 if [[ ! -f `which build` || ! -f `which GenFv` ]]; then - # build the tools if they don't yet exist - echo Building tools + # build the tools if they don't yet exist. Bin scheme + 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 else echo using prebuilt tools |