Find the exe prior to busybox resolution (carbon-language#4993)

This is required to make $PATH entries work.
danakj · Feb 20, 2025 · c2bc3c1 · c2bc3c1
1 parent 9cb6b71
commit c2bc3c1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/toolchain/install/busybox_main.cpp b/toolchain/install/busybox_main.cpp
@@ -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());