From owner-svn-src-head@FreeBSD.ORG  Wed Jun  9 19:15:58 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA3911065677;
	Wed,  9 Jun 2010 19:15:58 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C99008FC08;
	Wed,  9 Jun 2010 19:15:58 +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 o59JFwgf015261;
	Wed, 9 Jun 2010 19:15:58 GMT (envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o59JFwcu015259;
	Wed, 9 Jun 2010 19:15:58 GMT (envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201006091915.o59JFwcu015259@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 9 Jun 2010 19:15:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208962 - head/contrib/llvm/tools/clang/lib/Frontend
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 19:15:58 -0000

Author: rdivacky
Date: Wed Jun  9 19:15:58 2010
New Revision: 208962
URL: http://svn.freebsd.org/changeset/base/208962

Log:
  Remove the commented out piece that slipped as a mismerge.
  
  Approved by:	ed (mentor)

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

Modified: head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Wed Jun  9 19:12:25 2010	(r208961)
+++ head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Wed Jun  9 19:15:58 2010	(r208962)
@@ -871,16 +871,6 @@ void clang::ApplyHeaderSearchOptions(Hea
   else
     Init.AddDelimitedPaths(HSOpts.CEnvIncPath);
 
-#if 0 /* We place built-in includes in /usr/include. */
-  if (HSOpts.UseBuiltinIncludes) {
-    // Ignore the sys root, we *always* look for clang headers relative to
-    // supplied path.
-    llvm::sys::Path P(HSOpts.ResourceDir);
-    P.appendComponent("include");
-    Init.AddPath(P.str(), System, false, false, false, /*IgnoreSysRoot=*/ true);
-  }
-#endif
-
   if (HSOpts.UseStandardIncludes)
     Init.AddDefaultSystemIncludePaths(Lang, Triple, HSOpts);