Add -resource-dir to clang -cc1, this allows the base directory for compiler

resources (e.g., /usr/lib/clang/1.1) to be passed on the command line instead of
computed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91370 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/index-test/index-test.cpp b/tools/index-test/index-test.cpp
index 8b12c0ba8c..ff9fd54311 100644
--- a/tools/index-test/index-test.cpp
+++ b/tools/index-test/index-test.cpp
@@ -224,11 +224,10 @@ ASTUnit *CreateFromSource(const std::string &Filename, Diagnostic &Diags,
     Args.push_back(CompilerArgs[i].c_str());
 
   void *MainAddr = (void*) (intptr_t) CreateFromSource;
-  llvm::sys::Path ResourcesPath(
-    CompilerInvocation::GetBuiltinIncludePath(Argv0, MainAddr));
-  ResourcesPath.eraseComponent();
+  std::string ResourceDir =
+    CompilerInvocation::GetResourcesPath(Argv0, MainAddr);
   return ASTUnit::LoadFromCommandLine(Args.data(), Args.data() + Args.size(),
-                                      Diags, ResourcesPath.str());
+                                      Diags, ResourceDir);
 }
 
 int main(int argc, char **argv) {