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
diff --git a/tools/clang-cc/Options.cpp b/tools/clang-cc/Options.cpp
index 174143d..1dccafd 100644
--- a/tools/clang-cc/Options.cpp
+++ b/tools/clang-cc/Options.cpp
@@ -910,8 +910,7 @@
}
void clang::InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
- llvm::StringRef BuiltinIncludePath,
- const LangOptions &Lang) {
+ llvm::StringRef BuiltinIncludePath) {
using namespace headersearchoptions;
Opts.Sysroot = isysroot;
@@ -993,19 +992,14 @@
Opts.EnvIncPath = Env;
// Add language specific environment paths.
- if (Lang.CPlusPlus && Lang.ObjC1) {
- if (const char *Env = getenv("OBJCPLUS_INCLUDE_PATH"))
- Opts.LangEnvIncPath = Env;
- } else if (Lang.CPlusPlus) {
- if (const char *Env = getenv("CPLUS_INCLUDE_PATH"))
- Opts.LangEnvIncPath = Env;
- } else if (Lang.ObjC1) {
- if (const char *Env = getenv("OBJC_INCLUDE_PATH"))
- Opts.LangEnvIncPath = Env;
- } else {
- if (const char *Env = getenv("C_INCLUDE_PATH"))
- Opts.LangEnvIncPath = Env;
- }
+ if (const char *Env = getenv("OBJCPLUS_INCLUDE_PATH"))
+ Opts.ObjCXXEnvIncPath = Env;
+ if (const char *Env = getenv("CPLUS_INCLUDE_PATH"))
+ Opts.CXXEnvIncPath = Env;
+ if (const char *Env = getenv("OBJC_INCLUDE_PATH"))
+ Opts.CEnvIncPath = Env;
+ if (const char *Env = getenv("C_INCLUDE_PATH"))
+ Opts.CEnvIncPath = Env;
if (!nobuiltininc)
Opts.BuiltinIncludePath = BuiltinIncludePath;