contrib/llvm/patches/patch-r208961-clang-version-include.diff

   1 This patch adjusts clang's default include paths to add FreeBSD-specific
   2 directories.
   3
   4 Introduced here: http://svnweb.freebsd.org/changeset/base/208961
   5
   6 Index: tools/clang/lib/Frontend/InitHeaderSearch.cpp
   7 ===================================================================
   8 --- tools/clang/lib/Frontend/InitHeaderSearch.cpp
   9 +++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
  10 @@ -14,6 +14,7 @@
  11  #include "clang/Frontend/Utils.h"
  12  #include "clang/Basic/FileManager.h"
  13  #include "clang/Basic/LangOptions.h"
  14 +#include "clang/Basic/Version.h"
  15  #include "clang/Config/config.h" // C_INCLUDE_DIRS
  16  #include "clang/Lex/HeaderSearch.h"
  17  #include "clang/Lex/HeaderSearchOptions.h"
  18 @@ -333,6 +334,9 @@ void InitHeaderSearch::AddDefaultCIncludePaths(con
  19  #endif
  20      }
  21      break;
  22 +  case llvm::Triple::FreeBSD:
  23 +    AddPath("/usr/include/clang/" CLANG_VERSION_STRING, System, false);
  24 +    break;
  25
  26    default:
  27      break;
  28 @@ -423,11 +427,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple
  29      else
  30        AddPath("/usr/include/c++/4.4", CXXSystem, false);
  31      break;
  32 -  case llvm::Triple::FreeBSD:
  33 -    // FreeBSD 8.0
  34 -    // FreeBSD 7.3
  35 -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple);
  36 -    break;
  37    case llvm::Triple::OpenBSD: {
  38      std::string t = triple.getTriple();
  39      if (t.substr(0, 6) == "x86_64")