patch-r208961-clang-version-include.diff revision 269012
1121054SemaxThis patch adjusts clang's default include paths to add FreeBSD-specific
2121054Semaxdirectories.
3121054Semax
4121054SemaxIntroduced here: http://svnweb.freebsd.org/changeset/base/208961
5121054Semax
6121054SemaxIndex: tools/clang/lib/Frontend/InitHeaderSearch.cpp
7121054Semax===================================================================
8121054Semax--- tools/clang/lib/Frontend/InitHeaderSearch.cpp
9121054Semax+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
10121054Semax@@ -14,6 +14,7 @@
11121054Semax #include "clang/Frontend/Utils.h"
12121054Semax #include "clang/Basic/FileManager.h"
13121054Semax #include "clang/Basic/LangOptions.h"
14121054Semax+#include "clang/Basic/Version.h"
15121054Semax #include "clang/Config/config.h" // C_INCLUDE_DIRS
16121054Semax #include "clang/Lex/HeaderSearch.h"
17121054Semax #include "clang/Lex/HeaderSearchOptions.h"
18121054Semax@@ -333,6 +334,9 @@ void InitHeaderSearch::AddDefaultCIncludePaths(con
19121054Semax #endif
20121054Semax     }
21121054Semax     break;
22121054Semax+  case llvm::Triple::FreeBSD:
23121054Semax+    AddPath("/usr/include/clang/" CLANG_VERSION_STRING, System, false);
24121054Semax+    break;
25121054Semax       
26121054Semax   default:
27121054Semax     break;
28121054Semax@@ -423,11 +427,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple
29121054Semax     else
30121054Semax       AddPath("/usr/include/c++/4.4", CXXSystem, false);
31121054Semax     break;
32121054Semax-  case llvm::Triple::FreeBSD:
33121054Semax-    // FreeBSD 8.0
34121054Semax-    // FreeBSD 7.3
35121054Semax-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple);
36121054Semax-    break;
37121054Semax   case llvm::Triple::OpenBSD: {
38121054Semax     std::string t = triple.getTriple();
39121054Semax     if (t.substr(0, 6) == "x86_64")
40121054Semax