Clear EFI_SOURCE and EDK_SOURCE environment when workspace is changed.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index d81e7fd5edd300b75a6258b67dc4db826adcbeb5..7c7f52f6dd145c0c96a8b7286716383cdcb2fd7d 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -29,8 +29,21 @@
 @REM\r
 pushd .\r
 cd %~dp0\r
+\r
+if defined WORKSPACE (\r
+  if %WORKSPACE% == %CD% (\r
+    @REM workspace is not changed.\r
+    @goto ParseArgs\r
+  )\r
+)\r
+\r
+@REM set new workspace\r
+@REM clear EFI_SOURCE and EDK_SOURCE for the new workspace\r
 set WORKSPACE=%CD%\r
+set EFI_SOURCE=\r
+set EDK_SOURCE=\r
 \r
+:ParseArgs\r
 @if /I "%1"=="-h" goto Usage\r
 @if /I "%1"=="-help" goto Usage\r
 @if /I "%1"=="--help" goto Usage\r