BaseTools/toolsetup: Do not set CONF_PATH when already set.

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 76fd8bb6ef9e78188f73c4d93c3511e72dc2ba7f..c1ab9bcc8d33b6e7d03a7961f41bf1eeac5fd62b 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -160,13 +160,16 @@ if not defined WORKSPACE (
    goto skip_reconfig\r
 )\r
 \r
-set CONF_PATH=%WORKSPACE%\Conf\r
-if NOT exist %CONF_PATH% (\r
-  if defined PACKAGES_PATH (\r
-    for %%i IN (%PACKAGES_PATH%) DO (\r
-      if exist %%~fi\Conf (\r
-        set CONF_PATH=%%i\Conf\r
-        goto CopyConf\r
+if not defined CONF_PATH (\r
+  set CONF_PATH=%WORKSPACE%\Conf\r
+\r
+  if NOT exist %CONF_PATH% (\r
+    if defined PACKAGES_PATH (\r
+      for %%i IN (%PACKAGES_PATH%) DO (\r
+        if exist %%~fi\Conf (\r
+          set CONF_PATH=%%i\Conf\r
+          goto CopyConf\r
+        )\r
       )\r
     )\r
   )\r