diff options
| author | Rene Rivera <grafikrobot@gmail.com> | 2019-06-23 23:43:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 23:43:46 -0500 |
| commit | e08ea15f5e4ebebf9f59740ab2190e86841bf2d3 (patch) | |
| tree | 5643304b279a25dea526c7165223d46bbe777110 /bootstrap.bat | |
| parent | b368c08f09d08004644fe049ca6bacb61ce2fe59 (diff) | |
| download | boost-e08ea15f5e4ebebf9f59740ab2190e86841bf2d3.tar.gz | |
"Merge" from develop.
The location of b2 execs changed with release. Need this, or merge of previous equivalent PR, to fix `bootstrap.bat` errors.
Diffstat (limited to 'bootstrap.bat')
| -rw-r--r-- | bootstrap.bat | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 99ceb61584..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 |