From 0e3f390d24efec97371697f9aa9a0d2e56434704 Mon Sep 17 00:00:00 2001 From: Thomas Kent Date: Wed, 15 Mar 2017 06:26:57 -0500 Subject: [PATCH] Keep searching when the helper gives an error I'm seeing the errorlevel set even when a good value is found. Regardless, when there is an error we should move to the next check. --- src/engine/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine/build.bat b/src/engine/build.bat index c3d9a8f79..d0501bdb7 100644 --- a/src/engine/build.bat +++ b/src/engine/build.bat @@ -103,10 +103,11 @@ if not errorlevel 1 set "ProgramFiles=C:\Program Files" call :Clear_Error SET cl141cmd="%~dp0..\tools\vc141helper\cl141_path.cmd" for /F "tokens=*" %%A IN ('cmd /D /S /C "%cl141cmd% InstallationPath"') DO if NOT "_%%A_" == "__" ( - if errorlevel 1 goto :eof + if errorlevel 1 goto :VCFind_Error set "BOOST_JAM_TOOLSET=vc1410" set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\" goto :eof) +:VCFind_Error call :Clear_Error if EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( set "BOOST_JAM_TOOLSET=vc1410"