carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 09:31:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Find the exe prior to busybox resolution (#4993)

Browse Source 
This is required to make $PATH entries work.
This commit is contained in:
Jon Ross-Perkins
2025-02-20 21:06:18 +00:00
committed by GitHub
parent 9cb6b7190f
commit c2bc3c1719
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/install/busybox_main.cpp
+3 -2
View File
@@ -25,12 +25,13 @@ static auto Main(int argc, char** argv) -> ErrorOr<int> {
InitLLVM init_llvm(argc, argv);
// Start by resolving any symlinks.
CARBON_ASSIGN_OR_RETURN(auto busybox_info, GetBusyboxInfo(argv[0]));
CARBON_ASSIGN_OR_RETURN(auto busybox_info,
GetBusyboxInfo(FindExecutablePath(argv[0])));
auto fs = llvm::vfs::getRealFileSystem();
// Resolve paths before calling SetWorkingDirForBazel.
std::string exe_path = FindExecutablePath(busybox_info.bin_path.string());
std::string exe_path = busybox_info.bin_path.string();
const auto install_paths = InstallPaths::MakeExeRelative(exe_path);
if (install_paths.error()) {
return Error(*install_paths.error());