commit d613677ec9d0de87b6437765cbc9f7fd7c4fa62e
author Daniel Dunbar <daniel@zuster.org> Sun Dec 13 03:45:58 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Sun Dec 13 03:45:58 2009 +0000
tree 84ae2afb1cc6fd8dbe495abf683afffd5aef6b06
parent 85d2f8f875560f504bcca3fb82d23dd4b109e6f9

CompilerInvocation: Move builtin-include-path logic out of CompilerInvocation::CreateFromArgs.

llvm-svn: 91237

clang/lib/Frontend/ASTUnit.cpp

diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 8f66d4c..16d2ea9 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -327,7 +327,13 @@
   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);