:set_PATH\r
if defined WORKSPACE_TOOLS_PATH goto check_PATH\r
if not defined EDK_TOOLS_BIN (\r
- if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
- set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
- ) else (\r
+ set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
+ if not exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
echo.\r
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
echo. \r
- goto check_build_environment\r
)\r
)\r
set PATH=%EDK_TOOLS_BIN%;%PATH%\r
:check_PATH\r
if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok\r
if not defined EDK_TOOLS_BIN (\r
- if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
- set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
- ) else (\r
+ set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
+ if not exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
echo.\r
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
echo. \r
- goto check_build_environment\r
)\r
)\r
set PATH=%EDK_TOOLS_BIN%;%PATH%\r
if defined FORCE_REBUILD goto check_build_environment\r
if defined REBUILD goto check_build_environment\r
if not exist "%EDK_TOOLS_PATH%" goto check_build_environment\r
+if not exist "%EDK_TOOLS_BIN%" goto check_build_environment\r
\r
IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools\r
IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools\r