From 84e698ae859d77fc93240c14161ad5eb4665038e Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 12 Apr 2019 19:22:36 +0300 Subject: [PATCH] Apply #279 manually. Refs #279. --- bootstrap.bat | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index a269f7602d..74112452fb 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -2,16 +2,14 @@ SETLOCAL +REM Copyright 2019 Rene Rivera REM Copyright (C) 2009 Vladimir Prus REM REM Distributed under the Boost Software License, Version 1.0. REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ECHO Building Boost.Build engine -if exist ".\tools\build\src\engine\bin.ntx86\b2.exe" del tools\build\src\engine\bin.ntx86\b2.exe -if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" del tools\build\src\engine\bin.ntx86\bjam.exe -if exist ".\tools\build\src\engine\bin.ntx86_64\b2.exe" del tools\build\src\engine\bin.ntx86_64\b2.exe -if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" del tools\build\src\engine\bin.ntx86_64\bjam.exe +if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe pushd tools\build\src\engine call .\build.bat %* > ..\..\..\..\bootstrap.log @@ -19,14 +17,8 @@ call .\build.bat %* > ..\..\..\..\bootstrap.log popd -if exist ".\tools\build\src\engine\bin.ntx86\bjam.exe" ( - copy .\tools\build\src\engine\bin.ntx86\b2.exe . > nul - copy .\tools\build\src\engine\bin.ntx86\bjam.exe . > nul - goto :bjam_built) - -if exist ".\tools\build\src\engine\bin.ntx86_64\bjam.exe" ( - copy .\tools\build\src\engine\bin.ntx86_64\b2.exe . > nul - copy .\tools\build\src\engine\bin.ntx86_64\bjam.exe . > nul +if exist ".\tools\build\src\engine\b2.exe" ( + copy .\tools\build\src\engine\b2.exe . > nul goto :bjam_built) goto :bjam_failure @@ -50,6 +42,7 @@ IF "%1"=="vc11" SET TOOLSET=msvc : 11.0 IF "%1"=="vc12" SET TOOLSET=msvc : 12.0 IF "%1"=="vc14" SET TOOLSET=msvc : 14.0 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1 +IF "%1"=="vc142" SET TOOLSET=msvc : 14.2 ECHO. ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%...