Date: Fri, 16 Oct 2009 09:13:03 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r198167 - projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend Message-ID: <200910160913.n9G9D39N098860@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Fri Oct 16 09:13:03 2009 New Revision: 198167 URL: http://svn.freebsd.org/changeset/base/198167 Log: Adjust the paths setting to a new world order. 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 Fri Oct 16 09:03:31 2009 (r198166) +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp Fri Oct 16 09:13:03 2009 (r198167) @@ -115,11 +115,6 @@ void InitHeaderSearch::AddGnuCPlusPlusIn else AddPath(Base + "/" + Dir32, System, true, false, false); AddPath(Base + "/backward", System, true, false, false); -#if defined(LLVM_ON_FREEBSD) - if (Lang.CPlusPlus) - AddPath("/usr/include/c++/4.2", System, true, false, false); - AddPath("/usr/include", System, false, false, false); -#endif } void InitHeaderSearch::AddMinGWCPlusPlusIncludePaths(const std::string &Base, @@ -402,7 +397,9 @@ void InitHeaderSearch::AddDefaultSystemI // DragonFly AddPath("/usr/include/c++/4.1", System, true, false, false); // FreeBSD - AddPath("/usr/include/c++/4.2", System, true, false, false); + if (Lang.CPlusPlus) + AddPath("/usr/include/c++/4.2", System, true, false, false); + AddPath("/usr/include", System, false, false, false); break; case llvm::Triple::Solaris: // AuroraUX
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910160913.n9G9D39N098860>