From c50dd6a48fb364e9d9812cc177e08f62c390687a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 18 May 2018 12:11:26 +0200
Subject: Fix issue with bootstrap batch file

---
 bootstrap-msvc.bat | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bootstrap-msvc.bat')

diff --git a/bootstrap-msvc.bat b/bootstrap-msvc.bat
index 23cbb80..f26c7b9 100644
--- a/bootstrap-msvc.bat
+++ b/bootstrap-msvc.bat
@@ -42,14 +42,14 @@ goto :eof
   echo on
   %cxx% /I%owd%\%libbutl% /I%owd% /DBUILD2_BOOTSTRAP /DBUILD2_HOST_TRIPLET=\"i686-microsoft-win32-msvc\" %ops% /c /TP %*
   @echo off
-  if errorlevel 1 goto error
+  if errorlevel 1 exit /b 1
 goto :eof
 
 :link
   echo on
   %cxx% %ops% %*
   @echo off
-  if errorlevel 1 goto error
+  if errorlevel 1 exit /b 1
 goto :eof
 
 :start
@@ -121,6 +121,7 @@ if "_%1_" == "__" (
 rem First clean up any stale .obj files we might have laying around.
 rem
 call :clean_obj %src%
+if errorlevel 1 goto error
 
 rem Compile.
 rem
@@ -131,6 +132,7 @@ set "obj="
 for %%d in (%src%) do (
   cd %%d
   call :compile *.cxx
+  if errorlevel 1 goto error
   cd %owd%
   set "obj=!obj! %%d\*.obj"
 )
@@ -138,10 +140,12 @@ for %%d in (%src%) do (
 rem Link.
 rem
 call :link /Fe: build2\b-boot.exe %obj% shell32.lib imagehlp.lib
+if errorlevel 1 goto error
 
 rem Clean up.
 rem
 call :clean_obj %src%
+if errorlevel 1 goto error
 
 goto end
 
-- 
cgit v1.1