diff options
Diffstat (limited to 'clang/tools')
| -rw-r--r-- | clang/tools/driver/cc1_main.cpp | 6 | ||||
| -rw-r--r-- | clang/tools/index-test/index-test.cpp | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp index 5d7daccabdd..6e82c51d387 100644 --- a/clang/tools/driver/cc1_main.cpp +++ b/clang/tools/driver/cc1_main.cpp @@ -211,9 +211,9 @@ int cc1_main(const char **ArgBegin, const char **ArgEnd, // Infer the builtin include path if unspecified. if (Clang.getInvocation().getHeaderSearchOpts().UseBuiltinIncludes && - Clang.getInvocation().getHeaderSearchOpts().BuiltinIncludePath.empty()) - Clang.getInvocation().getHeaderSearchOpts().BuiltinIncludePath = - CompilerInvocation::GetBuiltinIncludePath(Argv0, MainAddr); + Clang.getInvocation().getHeaderSearchOpts().ResourceDir.empty()) + Clang.getInvocation().getHeaderSearchOpts().ResourceDir = + CompilerInvocation::GetResourcesPath(Argv0, MainAddr); // Honor -help. if (Clang.getInvocation().getFrontendOpts().ShowHelp) { diff --git a/clang/tools/index-test/index-test.cpp b/clang/tools/index-test/index-test.cpp index 8b12c0ba8cd..ff9fd543115 100644 --- a/clang/tools/index-test/index-test.cpp +++ b/clang/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) { |
