organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-11 23:53:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Adjust bootstrap for current B2 builds.

Browse source 
These are some minor adjustments to the bootstrap step of building B2. For bootstrap.bat we no longer shove B2 build output to the bootstrap.log file as we want to see the helpful diagnostic messages from B2. For example, indicating the requirement of C++11 for the engine build. This also renames from Boost.Build to B2. And adds clang as an option for bootstrap config creation.
This commit is contained in:
Rene Rivera 2020-02-13 22:14:33 -06:00 • committed by Peter Dimov
parent 563cd4401c
commit 26232c8d45
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap.bat
View file

@ -2,7 +2,7 @@
SETLOCAL SETLOCAL
REM Copyright 2019 Rene Rivera REM Copyright 2019-2020 Rene Rivera
REM Copyright (C) 2009 Vladimir Prus REM Copyright (C) 2009 Vladimir Prus
REM REM
REM Distributed under the Boost Software License, Version 1.0. REM Distributed under the Boost Software License, Version 1.0.
@ -12,7 +12,7 @@ ECHO Building Boost.Build engine
if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe
pushd tools\build\src\engine pushd tools\build\src\engine
call .\build.bat %* > ..\..\..\..\bootstrap.log call .\build.bat
@ECHO OFF @ECHO OFF
popd popd
@ -33,6 +33,7 @@ REM properly. Default to msvc if not specified.
SET TOOLSET=msvc SET TOOLSET=msvc
IF "%1"=="gcc" SET TOOLSET=gcc IF "%1"=="gcc" SET TOOLSET=gcc
IF "%1"=="clang" SET TOOLSET=clang
IF "%1"=="vc71" SET TOOLSET=msvc : 7.1 IF "%1"=="vc71" SET TOOLSET=msvc : 7.1
IF "%1"=="vc8" SET TOOLSET=msvc : 8.0 IF "%1"=="vc8" SET TOOLSET=msvc : 8.0
@ -88,7 +89,6 @@ goto :end
ECHO. ECHO.
ECHO Failed to build Boost.Build engine. ECHO Failed to build Boost.Build engine.
ECHO Please consult bootstrap.log for further diagnostics.
ECHO. ECHO.
REM Set an error code to allow `bootstrap && b2` REM Set an error code to allow `bootstrap && b2`