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

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 310ddd030c077debab1e0c3b88e1c9ff1324515a..a64938db609b123824899e56361a77f24e748766 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -160,7 +160,10 @@ if not defined WORKSPACE (
    goto skip_reconfig\r
 )\r
 \r
-set CONF_PATH=%WORKSPACE%\Conf\r
+if not defined CONF_PATH (\r
+  set CONF_PATH=%WORKSPACE%\Conf\r
+)\r
+\r
 if NOT exist %CONF_PATH% (\r
   if defined PACKAGES_PATH (\r
     for %%i IN (%PACKAGES_PATH%) DO (\r
@@ -322,24 +325,13 @@ goto end
       echo !!! WARNING !!! Will not be able to compile Python programs to .exe\r
       echo Will setup environment to run Python scripts directly.\r
       echo.\r
-      goto UpdatePATH\r
-    )\r
-    else (\r
-      goto UpdateEnv\r
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%"\r
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%"\r
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%"\r
+      set PATHEXT=%PATHEXT%;.py\r
     )\r
   )\r
-  else (\r
-    goto UpdateEnv\r
-  )\r
- \r
-:UpdatePATH\r
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%\r
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%\r
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%\r
-  set PATHEXT=%PATHEXT%;.py\r
-  goto UpdateEnv\r
- \r
-:UpdateEnv\r
+  \r
   echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%\r
   echo     PYTHON_PATH     = %PYTHON_PATH%\r
   echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%\r