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

Don't canonicalize prefixes when locating the driver binary. (#3912)

Browse Source 
The approach here directly follows the one used by Clang's driver.
This commit is contained in:
Richard Smith
2024-04-24 05:24:29 +00:00
committed by GitHub
parent ccf87f0a38
commit db35d17b6c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/driver_main.cpp
+12 -4
View File
@@ -9,6 +9,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
#include "toolchain/driver/driver.h"
auto main(int argc, char** argv) -> int {
@@ -18,6 +19,16 @@ auto main(int argc, char** argv) -> int {
return EXIT_FAILURE;
}
// Find the executable without resolving symlinks. Do a PATH lookup if argv[0]
// isn't a valid path.
llvm::SmallString<128> exe_path(argv[0]);
if (!llvm::sys::fs::exists(exe_path)) {
if (llvm::ErrorOr<std::string> path =
llvm::sys::findProgramByName(exe_path)) {
exe_path = *path;
}
}
Carbon::SetWorkingDirForBazel();
// Printing to stderr should flush stdout. This is most noticeable when stderr
@@ -28,10 +39,7 @@ auto main(int argc, char** argv) -> int {
auto fs = llvm::vfs::getRealFileSystem();
// Construct the data directory relative to the executable location.
static int static_for_main_addr;
std::string exe =
llvm::sys::fs::getMainExecutable(argv[0], &static_for_main_addr);
llvm::SmallString<256> data_dir(llvm::sys::path::parent_path(exe));
llvm::SmallString<256> data_dir(llvm::sys::path::parent_path(exe_path));
llvm::sys::path::append(data_dir, llvm::sys::path::Style::posix,
"carbon.runfiles/_main/");