From 3521ae95805fca90993847c40f5309a4f1dfd235 Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Mon, 9 Apr 2012 18:08:23 +0000 Subject: [PATCH] Fixes a fix to finding the current directory: We currently want to look whether PWD is available - if PWD is available it will get us the non-resolved current path, while fs::current_path will resolve symlinks. The long term fix is to not rely on that behavior any more. llvm-svn: 154330 --- clang/lib/Tooling/Tooling.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp index 4fa98aa2bfee..fa2374f5e30d 100644 --- a/clang/lib/Tooling/Tooling.cpp +++ b/clang/lib/Tooling/Tooling.cpp @@ -237,7 +237,10 @@ ClangTool::ClangTool(const CompilationDatabase &Compilations, ArrayRef SourcePaths) : Files((FileSystemOptions())) { llvm::SmallString<1024> BaseDirectory; - llvm::sys::fs::current_path(BaseDirectory); + if (const char *PWD = ::getenv("PWD")) + BaseDirectory = PWD; + else + llvm::sys::fs::current_path(BaseDirectory); for (unsigned I = 0, E = SourcePaths.size(); I != E; ++I) { llvm::SmallString<1024> File(getAbsolutePath( SourcePaths[I], BaseDirectory));