Fix issue where the script assumed tools are in Bin, but they are still in BinWrapper...

[mirror_edk2.git] / UnixPkg / build.sh

diff --git a/UnixPkg/build.sh b/UnixPkg/build.sh
index 16da8d051565257d28bc0f950e38c5cba5250d37..851e59fefa3085b0374a4f76168e4121add90c01 100755 (executable)
--- a/UnixPkg/build.sh
+++ b/UnixPkg/build.sh
@@ -24,9 +24,9 @@ then
   cd ..
 # 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
+#  export EDK_TOOLS_PATH=`pwd`/../BaseTools
 # This version is for the tools source in edk2
-#  export EDK_TOOLS_PATH=`pwd`/BaseTools
+  export EDK_TOOLS_PATH=`pwd`/BaseTools
   echo $EDK_TOOLS_PATH
   source edksetup.sh BaseTools
 else
@@ -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