diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-12-13 03:45:58 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-12-13 03:45:58 +0000 |
| commit | 1e69fe3a9f0a42b32a3000bda51677d51416564e (patch) | |
| tree | 6f30f101008f663dd37d5e0cb143c98d879bdb05 /lib/Frontend/ASTUnit.cpp | |
| parent | 8ec2d4ae203b36ecbd5838f2e856015abc52c76d (diff) | |
CompilerInvocation: Move builtin-include-path logic out of CompilerInvocation::CreateFromArgs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91237 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/ASTUnit.cpp')
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 8f66d4c166..16d2ea93d8 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -327,7 +327,13 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin, CompilerInvocation CI; CompilerInvocation::CreateFromArgs(CI, (const char**) CCArgs.data(), (const char**) CCArgs.data()+CCArgs.size(), - Argv0, MainAddr, Diags); + Diags); + + // Infer the builtin include path if unspecified. + if (CI.getHeaderSearchOpts().UseBuiltinIncludes && + CI.getHeaderSearchOpts().BuiltinIncludePath.empty()) + CI.getHeaderSearchOpts().BuiltinIncludePath = + CompilerInvocation::GetBuiltinIncludePath(Argv0, MainAddr); CI.getFrontendOpts().DisableFree = UseBumpAllocator; return LoadFromCompilerInvocation(CI, Diags, OnlyLocalDecls); |