Merge outstanding develop changes (as appropriate).

This commit is contained in:
Rene Rivera
2015-08-05 10:20:35 -05:00
parent c3864a8035
commit 51e693134f
9 changed files with 122 additions and 32 deletions

View File

@@ -32,7 +32,7 @@ goto :bjam_failure
:bjam_built
REM Ideally, we should obtain the toolset that build.bat has
REM guessed. However, it uses setlocal at the start and does
REM guessed. However, it uses setlocal at the start and does not
REM export BOOST_JAM_TOOLSET, and I don't know how to do that
REM properly. Default to msvc for now.
set toolset=msvc
@@ -67,7 +67,7 @@ goto :end
ECHO.
ECHO Failed to build Boost.Build engine.
ECHO Please consult bootstrap.log for furter diagnostics.
ECHO Please consult bootstrap.log for further diagnostics.
ECHO.
ECHO You can try to obtain a prebuilt binary from
ECHO.