boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix "bootstrap.bat borland" failing to find label "Test_Path"

Browse Source 
If an override toolset is given in the `bootstrap.bat` command-line,
`bootstrap.bat` -> `src/engine/build.bat` bypasses loading
`src/engine/guess_toolset.bat` entirely. Later on the call to
`Test_Path` from `build.bat` -> `config_toolset.bat` fails to find that
label.

Fix this by making a new parameterized entry-point `test_path` inside
`guess_toolset.bat` for this caller in `config_toolset.bat`.

Fixes: #382.
This commit is contained in:
Tanzinul Islam
2019-01-06 21:55:58 +00:00
committed by Tanzinul Islam
parent c8c1064cac
commit 9339693c0a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/config_toolset.bat
View File

@@ -184,7 +184,7 @@ set "_known_=1"
:Skip_VC141 :Skip_VC141
if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND
if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
call :Test_Path bcc32.exe ) call guess_toolset.bat test_path bcc32.exe )
if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
if not errorlevel 1 ( if not errorlevel 1 (
set "BOOST_JAM_TOOLSET_ROOT=%FOUND_PATH%..\" set "BOOST_JAM_TOOLSET_ROOT=%FOUND_PATH%..\"

3
src/engine/guess_toolset.bat
View File

@@ -5,6 +5,9 @@ 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) REM ~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
if "_%1_" == "_yacc_" goto Guess_Yacc if "_%1_" == "_yacc_" goto Guess_Yacc
if "_%1_" == "_test_path_" (
shift
goto Test_Path)
goto Guess goto Guess