From owner-svn-src-projects@FreeBSD.ORG Wed May 19 17:11:40 2010 Return-Path: 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 BC9E71065672; Wed, 19 May 2010 17:11:40 +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 AA96A8FC1C; Wed, 19 May 2010 17:11:40 +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 o4JHBesU035567; Wed, 19 May 2010 17:11:40 GMT (envelope-from rdivacky@svn.freebsd.org) Received: (from rdivacky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4JHBesT035565; Wed, 19 May 2010 17:11:40 GMT (envelope-from rdivacky@svn.freebsd.org) Message-Id: <201005191711.o4JHBesT035565@svn.freebsd.org> From: Roman Divacky Date: Wed, 19 May 2010 17:11:40 +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: r208302 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2010 17:11:40 -0000 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,