diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 76fd8bb6ef..c1ab9bcc8d 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -160,13 +160,16 @@ if not defined WORKSPACE ( goto skip_reconfig ) -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 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 + ) ) ) )