svn commit: r209176 -
projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend
Roman Divacky
rdivacky at FreeBSD.org
Mon Jun 14 21:11:24 UTC 2010
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);
More information about the svn-src-projects
mailing list