BaseTools/toolsetup.bat: Fix bug caused by 'CONF_PATH' not defined

In batch script files, setting a variable in an 'if' block will only take
effect after the 'if' block.

This commit fixes the issue of using the variable 'CONF_PATH' right after
it is being set in an 'if' block.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu 2016-07-26 13:31:20 +08:00
parent b4815479d6
commit ae5cc3c303
1 changed files with 7 additions and 7 deletions

View File

@ -162,14 +162,14 @@ if not defined WORKSPACE (
if not defined CONF_PATH (
set CONF_PATH=%WORKSPACE%\Conf
)
if NOT exist %CONF_PATH% (
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
if exist %%~fi\Conf (
set CONF_PATH=%%i\Conf
goto CopyConf
)
if NOT exist %CONF_PATH% (
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
if exist %%~fi\Conf (
set CONF_PATH=%%i\Conf
goto CopyConf
)
)
)