Fixes the header search logic for tools:
The driver needs to get the correct path to the executable to deduce
the header search path.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155542 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Tooling/Tooling.cpp b/lib/Tooling/Tooling.cpp
index fa2374f..646a22a 100644
--- a/lib/Tooling/Tooling.cpp
+++ b/lib/Tooling/Tooling.cpp
@@ -29,6 +29,9 @@
namespace clang {
namespace tooling {
+// Exists solely for the purpose of lookup of the resource path.
+static int StaticSymbol;
+
FrontendActionFactory::~FrontendActionFactory() {}
// FIXME: This file contains structural duplication with other parts of the
@@ -39,9 +42,20 @@
static clang::driver::Driver *newDriver(clang::DiagnosticsEngine *Diagnostics,
const char *BinaryName) {
const std::string DefaultOutputName = "a.out";
+ // This just needs to be some symbol in the binary.
+ void *const SymbolAddr = &StaticSymbol;
+ // The driver detects the builtin header path based on the path of
+ // the executable.
+ // FIXME: On linux, GetMainExecutable is independent of the content
+ // of BinaryName, thus allowing ClangTool and runToolOnCode to just
+ // pass in made-up names here (in the case of ClangTool this being
+ // the original compiler invocation). Make sure this works on other
+ // platforms.
+ llvm::sys::Path MainExecutable =
+ llvm::sys::Path::GetMainExecutable(BinaryName, SymbolAddr);
clang::driver::Driver *CompilerDriver = new clang::driver::Driver(
- BinaryName, llvm::sys::getDefaultTargetTriple(),
- DefaultOutputName, false, *Diagnostics);
+ MainExecutable.str(), llvm::sys::getDefaultTargetTriple(),
+ DefaultOutputName, false, *Diagnostics);
CompilerDriver->setTitle("clang_based_tool");
return CompilerDriver;
}
@@ -171,9 +185,6 @@
Invocation.take(), *CC1Args, ToolAction.take());
}
-// Exists solely for the purpose of lookup of the resource path.
-static int StaticSymbol;
-
bool ToolInvocation::runInvocation(
const char *BinaryName,
clang::driver::Compilation *Compilation,