Date: Wed, 9 Jun 2010 19:15:58 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r208962 - head/contrib/llvm/tools/clang/lib/Frontend Message-ID: <201006091915.o59JFwcu015259@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006091915.o59JFwcu015259>