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 59874c58392f7eab3edf8e72ed8e3ca658737ff0..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,9 +325,9 @@ 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
-      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 "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