From 33024da7a8f046ae85fc7f48ea7d4342da3dd5d7 Mon Sep 17 00:00:00 2001 From: Thomas Kent Date: Mon, 20 Mar 2017 21:45:31 -0500 Subject: [PATCH] Found changes moved out of build.bat --- src/engine/config_toolset.bat | 6 +++--- src/engine/guess_toolset.bat | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/engine/config_toolset.bat b/src/engine/config_toolset.bat index 7811923d8..10074b0b3 100644 --- a/src/engine/config_toolset.bat +++ b/src/engine/config_toolset.bat @@ -160,7 +160,7 @@ set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" :Skip_VC14 -if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc1410_" goto Skip_VC1410 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc141_" goto Skip_VC141 if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( if NOT "_%VS150COMNTOOLS%_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\" @@ -170,7 +170,7 @@ if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( for /f "tokens=*" %%A in ('cmd /D /S /C "%cl_path_cmd% 14.10"') do if NOT errorlevel 1 if NOT "_%%A_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\")) -REM vc1410 vsvarsall requires the architecture as a parameter. +REM vc141 vsvarsall requires the architecture as a parameter. if "_%BOOST_JAM_ARCH%_" == "__" set BOOST_JAM_ARCH=x86 set BOOST_JAM_ARGS=%BOOST_JAM_ARGS% %BOOST_JAM_ARCH% @@ -180,7 +180,7 @@ set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" -:Skip_VC1410 +:Skip_VC141 if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( call :Test_Path bcc32.exe ) diff --git a/src/engine/guess_toolset.bat b/src/engine/guess_toolset.bat index 129ea4293..91560a3f8 100644 --- a/src/engine/guess_toolset.bat +++ b/src/engine/guess_toolset.bat @@ -29,24 +29,24 @@ goto :eof REM Check the variable first. This can be set manually by the user (by running the tools commmand prompt). call :Clear_Error if NOT "_%VS150COMNTOOLS%_" == "__" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\" goto :eof) SET cl_path_cmd="%~dp0..\tools\vc141helper\cl_path.cmd" for /f "tokens=*" %%A in ('cmd /D /S /C "%cl_path_cmd% 14.10"') do if NOT errorlevel 1 if NOT "_%%A_" == "__" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\" goto :eof) if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\" goto :eof) if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Professional\VC\" goto :eof) if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Community\VC\" goto :eof) if NOT "_%VS140COMNTOOLS%_" == "__" (