diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2016-07-26 13:31:20 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-07-26 14:10:56 +0800 |
| commit | ae5cc3c30301aebb59e817c09762dc6ec8009621 (patch) | |
| tree | 6549810ca4451631cd5304a4108239ec5fb4d592 /BaseTools | |
| parent | b4815479d6cab7fb9edf222a11e58a3721863a4c (diff) | |
| download | edk2-ae5cc3c30301aebb59e817c09762dc6ec8009621.zip edk2-ae5cc3c30301aebb59e817c09762dc6ec8009621.tar.gz edk2-ae5cc3c30301aebb59e817c09762dc6ec8009621.tar.bz2 | |
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>
Diffstat (limited to 'BaseTools')
| -rwxr-xr-x | BaseTools/toolsetup.bat | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index c1ab9bc..a64938d 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -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
)
)
)
|