diff --git a/edksetup.bat b/edksetup.bat
index 740537faa6..2f7fedef33 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -277,7 +277,7 @@ echo.
 
 :NewBuild
 @IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
-@set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
 @call BaseTools\toolsetup.bat
 @goto end