Date: Wed, 19 May 2010 17:11:40 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r208302 - projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend Message-ID: <201005191711.o4JHBesT035565@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Wed May 19 17:11:40 2010 New Revision: 208302 URL: http://svn.freebsd.org/changeset/base/208302 Log: Sync header search code with clangbsd-import. 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 Wed May 19 15:50:17 2010 (r208301) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp Wed May 19 17:11:40 2010 (r208302) @@ -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" @@ -476,12 +477,12 @@ void InitHeaderSearch::AddDefaultCInclud case llvm::Triple::MinGW32: AddPath("c:/mingw/include", System, true, false, false); break; - case llvm::Triple::FreeBSD: - AddPath("/usr/include/clang/1.5", System, true, false, false); default: break; } + AddPath("/usr/include/clang/" CLANG_VERSION_STRING, + System, false, false, false); AddPath("/usr/include", System, false, false, false); } @@ -815,6 +816,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. @@ -822,6 +824,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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005191711.o4JHBesT035565>