From 9339693c0afca79140d41ce767a86b8be86e838b Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Sun, 6 Jan 2019 21:55:58 +0000 Subject: [PATCH] Fix "bootstrap.bat borland" failing to find label "Test_Path" 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. --- src/engine/config_toolset.bat | 2 +- src/engine/guess_toolset.bat | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/config_toolset.bat b/src/engine/config_toolset.bat index b0bdfbb6f..a941ad033 100644 --- a/src/engine/config_toolset.bat +++ b/src/engine/config_toolset.bat @@ -184,7 +184,7 @@ set "_known_=1" :Skip_VC141 if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( - call :Test_Path bcc32.exe ) + call guess_toolset.bat test_path bcc32.exe ) if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( if not errorlevel 1 ( set "BOOST_JAM_TOOLSET_ROOT=%FOUND_PATH%..\" diff --git a/src/engine/guess_toolset.bat b/src/engine/guess_toolset.bat index 9effe683b..00ce3097d 100644 --- a/src/engine/guess_toolset.bat +++ b/src/engine/guess_toolset.bat @@ -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) if "_%1_" == "_yacc_" goto Guess_Yacc +if "_%1_" == "_test_path_" ( + shift + goto Test_Path) goto Guess