X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=03044416f7e0bf4e1e37dde066170174ef6cd736;hp=6e526cdd03c6c12b4cd85177a23358bcd527b1d6;hb=2922e29ad86c1bb7b5e53e65eaf0098d866310d7;hpb=7ef23d9c2c2fe8e295f85d44591dd9f0d1fbc0bc

diff --git a/edksetup.bat b/edksetup.bat
index 6e526cdd03..03044416f7 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -89,7 +89,7 @@ shift
 
 :no_nt32
 if /I "%1"=="NewBuild" shift
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
 call %EDK_TOOLS_PATH%\toolsetup.bat %*
 if /I "%1"=="Reconfig" shift
@@ -110,6 +110,13 @@ goto check_cygwin
   goto end
 
 :check_cygwin
+if defined CYGWIN_HOME (
+  if not exist "%CYGWIN_HOME%" (
+    @echo.
+    @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!
+    @echo.
+  )
+) else (
   if exist c:\cygwin (
     set CYGWIN_HOME=c:\cygwin
   ) else (
@@ -117,9 +124,10 @@ goto check_cygwin
     @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
     @echo.
   )
+)
 
-if NOT "%1"=="" goto Usage
-goto end
+:cygwin_done
+if "%1"=="" goto end
 
 :Usage
   @echo.
@@ -129,8 +137,8 @@ goto end
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.
   @echo.
   @echo  Note that target.template, tools_def.template and build_rules.template
-  @echo  will be only copied to target.txt, tools_def.txt and build_rule.txt
-  @echo  respectively if they do not exist. Using option [Reconfig] to force the copy. 
+  @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt
+  @echo  respectively if they do not exist. Use option [Reconfig] to force the copy.
   @echo.
   goto end