From owner-svn-src-projects@FreeBSD.ORG  Mon Jun 14 21:11:24 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 1945F106566B;
	Mon, 14 Jun 2010 21:11:24 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 087058FC1E;
	Mon, 14 Jun 2010 21:11:24 +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 o5ELBNxa071601;
	Mon, 14 Jun 2010 21:11:23 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5ELBNO8071599;
	Mon, 14 Jun 2010 21:11:23 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201006142111.o5ELBNO8071599@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 14 Jun 2010 21:11:23 +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: r209176 -
	projects/clangbsd/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: Mon, 14 Jun 2010 21:11:24 -0000

Author: rdivacky
Date: Mon Jun 14 21:11:23 2010
New Revision: 209176
URL: http://svn.freebsd.org/changeset/base/209176

Log:
  Fix a mismerge and get us closer to head.

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

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Mon Jun 14 21:01:13 2010	(r209175)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Mon Jun 14 21:11:23 2010	(r209176)
@@ -408,6 +408,7 @@ static bool getWindowsSDKDir(std::string
 
 void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
                                             const HeaderSearchOptions &HSOpts) {
+#if 0 /* Remove unneeded include paths. */
   // FIXME: temporary hack: hard-coded paths.
   AddPath("/usr/local/include", System, true, false, false);
 
@@ -420,6 +421,7 @@ void InitHeaderSearch::AddDefaultCInclud
     P.appendComponent("include");
     AddPath(P.str(), System, false, false, false, /*IgnoreSysRoot=*/ true);
   }
+#endif
 
   // Add dirs specified via 'configure --with-c-include-dirs'.
   llvm::StringRef CIncludeDirs(C_INCLUDE_DIRS);