boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 00:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Clear the error instead of not setting it.

Browse Source 
Rearranged order for newest first.
This commit is contained in:
Tom Kent
2019-03-05 16:23:53 -06:00
parent 1691e6194c
commit de026bc61e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/engine/guess_toolset.bat
View File

@@ -32,21 +32,20 @@ goto :eof
REM Check the variable first. This can be set manually by the user (by running the tools command prompt). REM Check the variable first. This can be set manually by the user (by running the tools command prompt).
call :Clear_Error call :Clear_Error
call vswhere_usability_wrapper.cmd call vswhere_usability_wrapper.cmd
if NOT "_%VS150COMNTOOLS%_" == "__" ( call :Clear_Error
set "BOOST_JAM_TOOLSET=vc141" REM VSUNKCOMNTOOLS represents unknown but detected version from vswhere
set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\" if NOT "_%VSUNKCOMNTOOLS%_" == "__" (
set "BOOST_JAM_TOOLSET=vcunk"
set "BOOST_JAM_TOOLSET_ROOT=%VSUNKCOMNTOOLS%..\..\VC\"
goto :eof) goto :eof)
if NOT "_%VS160COMNTOOLS%_" == "__" ( if NOT "_%VS160COMNTOOLS%_" == "__" (
set "BOOST_JAM_TOOLSET=vc142" set "BOOST_JAM_TOOLSET=vc142"
set "BOOST_JAM_TOOLSET_ROOT=%VS160COMNTOOLS%..\..\VC\" set "BOOST_JAM_TOOLSET_ROOT=%VS160COMNTOOLS%..\..\VC\"
goto :eof) goto :eof)
if NOT "_%VSUNKCOMNTOOLS%_" == "__" ( if NOT "_%VS150COMNTOOLS%_" == "__" (
set "BOOST_JAM_TOOLSET=vcunk" set "BOOST_JAM_TOOLSET=vc141"
set "BOOST_JAM_TOOLSET_ROOT=%VSUNKCOMNTOOLS%..\..\VC\" set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\"
goto :eof) goto :eof)
:skip_vswhere
call :Clear_Error
if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET=vc141"
set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\"

2
src/engine/vswhere_usability_wrapper.cmd
View File

@@ -56,4 +56,4 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
:no-vswhere :no-vswhere
endlocal endlocal
echo could not find "vswhere" echo could not find "vswhere"
exit /B 0 exit /B 1