always search for "builtin" headers at the end of the search path,

and never remap them with -isysroot.  This fixes PR3614.

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

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index a818c8d1a4ee36ef58f140ffdd3a33344c53a843..79166fb0bdf9b68f69769c62b5854aa5bd0dde45 100644 (file)
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -1098,8 +1098,8 @@ void InitializeIncludePaths(const char *Argv0, HeaderSearch &Headers,
     MainExecutablePath.eraseComponent();  // Remove /clang from foo/bin/clang
     MainExecutablePath.eraseComponent();  // Remove /bin   from foo/bin
     MainExecutablePath.appendComponent("Headers"); // Get foo/Headers
-    Init.AddPath(MainExecutablePath.c_str(), InitHeaderSearch::System,
-        false, false, false);
+    Init.AddPath(MainExecutablePath.c_str(), InitHeaderSearch::After,
+                 false, false, false);
   }
   
   if (!nostdinc)