From 6b40dd361e1ded4fb7094fbeb5ffe1a507a05b04 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Jun 2020 13:52:05 -0500 Subject: [PATCH] Fix path to portable install style bootstrap. --- src/engine/startup.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/engine/startup.cpp b/src/engine/startup.cpp index fdea4d75d..f58625408 100644 --- a/src/engine/startup.cpp +++ b/src/engine/startup.cpp @@ -183,8 +183,11 @@ bool b2::startup::bootstrap(FRAME *frame) // Check relative to the executable for portable install location. if (b2_file_path.empty()) { - if (b2::filesys::is_file(b2_exe_path + "/kernel/" + boost_build_jam)) - b2_file_path = b2_exe_path + "/kernel/" + boost_build_jam; + const std::string path{ + b2::paths::normalize( + b2_exe_path + "/../.b2/kernel/" + boost_build_jam)}; + if (b2::filesys::is_file(path)) + b2_file_path = path; } // Check relative to the executable for portable install location.