aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-05-18 12:11:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-05-18 12:11:26 +0200
commitc50dd6a48fb364e9d9812cc177e08f62c390687a (patch)
treefd545ee1b53b5e2e3d627abb5cada3b52b946d3d
parent5163b396c239ab1ae3fb8aafa35b3841f578c72f (diff)
Fix issue with bootstrap batch file
-rw-r--r--bootstrap-msvc.bat8
1 files changed, 6 insertions, 2 deletions
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