1 files changed, 8 insertions, 4 deletions

diff --git a/include/clang/Frontend/HeaderSearchOptions.h b/include/clang/Frontend/HeaderSearchOptions.h
index 67129775ac8d..690408547c0d 100644
--- a/include/clang/Frontend/HeaderSearchOptions.h
+++ b/include/clang/Frontend/HeaderSearchOptions.h
@@ -61,9 +61,12 @@ public:
   std::string CXXEnvIncPath;
   std::string ObjCXXEnvIncPath;
 
-  /// If non-empty, the path to the compiler builtin include directory, which
-  /// will be searched following the user and environment includes.
-  std::string BuiltinIncludePath;
+  /// The directory which holds the compiler resource files (builtin includes,
+  /// etc.).
+  std::string ResourceDir;
+
+  /// Include the compiler builtin includes.
+  unsigned UseBuiltinIncludes : 1;
 
   /// Include the system standard include search directories.
   unsigned UseStandardIncludes : 1;
@@ -73,7 +76,8 @@ public:
 
 public:
   HeaderSearchOptions(llvm::StringRef _Sysroot = "/")
-    : Sysroot(_Sysroot), UseStandardIncludes(true), Verbose(false) {}
+    : Sysroot(_Sysroot), UseBuiltinIncludes(true),
+      UseStandardIncludes(true), Verbose(false) {}
 
   /// AddPath - Add the \arg Path path to the specified \arg Group list.
   void AddPath(llvm::StringRef Path, frontend::IncludeDirGroup Group,