From owner-svn-src-projects@FreeBSD.ORG  Wed May 12 20:15:06 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C4461065670;
	Wed, 12 May 2010 20:15:06 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C0458FC1D;
	Wed, 12 May 2010 20:15:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4CKF55t012318;
	Wed, 12 May 2010 20:15:05 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4CKF5PF012316;
	Wed, 12 May 2010 20:15:05 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201005122015.o4CKF5PF012316@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 12 May 2010 20:15:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207997 -
	projects/clangbsd-import/contrib/llvm/tools/clang/lib/Frontend
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 May 2010 20:15:06 -0000

Author: ed
Date: Wed May 12 20:15:05 2010
New Revision: 207997
URL: http://svn.freebsd.org/changeset/base/207997

Log:
  Fix built-in header location of Clang.

Modified:
  projects/clangbsd-import/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp

Modified: projects/clangbsd-import/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
==============================================================================
--- projects/clangbsd-import/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Wed May 12 20:10:29 2010	(r207996)
+++ projects/clangbsd-import/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Wed May 12 20:15:05 2010	(r207997)
@@ -14,6 +14,7 @@
 #include "clang/Frontend/Utils.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/LangOptions.h"
+#include "clang/Basic/Version.h"
 #include "clang/Frontend/HeaderSearchOptions.h"
 #include "clang/Lex/HeaderSearch.h"
 #include "llvm/ADT/SmallString.h"
@@ -480,6 +481,8 @@ void InitHeaderSearch::AddDefaultCInclud
     break;
   }
 
+  AddPath("/usr/include/clang/" CLANG_VERSION_STRING,
+    System, false, false, false);
   AddPath("/usr/include", System, false, false, false);
 }
 
@@ -812,6 +815,7 @@ void clang::ApplyHeaderSearchOptions(Hea
   else
     Init.AddDelimitedPaths(HSOpts.CEnvIncPath);
 
+#if 0 /* XXX: Always points to an invalid path. */
   if (HSOpts.UseBuiltinIncludes) {
     // Ignore the sys root, we *always* look for clang headers relative to
     // supplied path.
@@ -819,6 +823,7 @@ void clang::ApplyHeaderSearchOptions(Hea
     P.appendComponent("include");
     Init.AddPath(P.str(), System, false, false, false, /*IgnoreSysRoot=*/ true);
   }
+#endif
 
   if (HSOpts.UseStandardIncludes)
     Init.AddDefaultSystemIncludePaths(Lang, Triple,