From 734932c7dc77a16b15d466588e10d76bcd6d13c7 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 18 Mar 2009 20:25:53 +0000 Subject: [PATCH] Driver: Get executable path using llvm::sys::Path::GetMainExecutable. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67228 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/driver/driver.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index fac4403251..865b57c5ab 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -60,15 +60,18 @@ void DriverDiagnosticPrinter::HandleDiagnostic(Diagnostic::Level Level, OS << '\n'; } +llvm::sys::Path GetExecutablePath(const char *Argv0) { + // This just needs to be some symbol in the binary; C++ doesn't + // allow taking the address of ::main however. + void *P = (void*) (intptr_t) GetExecutablePath; + return llvm::sys::Path::GetMainExecutable(Argv0, P); +} + int main(int argc, const char **argv) { llvm::sys::PrintStackTraceOnErrorSignal(); llvm::PrettyStackTraceProgram X(argc, argv); - // FIXME: We should use GetMainExecutable here, probably, but we may - // want to handle symbolic links slightly differently. The problem - // is that the path derived from this will influence search paths. - llvm::sys::Path Path(argv[0]); - + llvm::sys::Path Path = GetExecutablePath(argv[0]); llvm::OwningPtr DiagClient(new DriverDiagnosticPrinter(Path.getBasename(), llvm::errs())); -- 2.50.1