commit c363cb1929c7908c8c8c4b77d025c2ccb09284ae
author Daniel Dunbar <daniel@zuster.org> Mon Nov 16 22:38:40 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Mon Nov 16 22:38:40 2009 +0000
tree d1f761cf6225913e794b8667c1bb9734ce3555e4
parent 6143ea28a922ebd1d81a4fc0093d4daeab1e42ac

Store more information in HeaderSearchOptions so that its initialization is not
language dependent.

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

lib/Frontend/InitHeaderSearch.cpp

diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 70f0b21..5964a26 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -636,7 +636,14 @@
 
   // Add entries from CPATH and friends.
   Init.AddDelimitedPaths(HSOpts.EnvIncPath.c_str());
-  Init.AddDelimitedPaths(HSOpts.LangEnvIncPath.c_str());
+  if (Lang.CPlusPlus && Lang.ObjC1)
+    Init.AddDelimitedPaths(HSOpts.ObjCXXEnvIncPath.c_str());
+  else if (Lang.CPlusPlus)
+    Init.AddDelimitedPaths(HSOpts.CXXEnvIncPath.c_str());
+  else if (Lang.ObjC1)
+    Init.AddDelimitedPaths(HSOpts.ObjCEnvIncPath.c_str());
+  else
+    Init.AddDelimitedPaths(HSOpts.CEnvIncPath.c_str());
 
   if (!HSOpts.BuiltinIncludePath.empty()) {
     // Ignore the sys root, we *always* look for clang headers relative to