Merge pull request #334 from jwendell/fix-clang-19-rhel

Fix to build with newer Clang versions and RHEL

Author: jwendell

bssl-compat/prefixer/prefixer.cpp

@@ -112,7 +112,7 @@ class Function {
 
     std::string getHeader(const clang::SourceManager &srcmgr) const {
       clang::SourceLocation sloc = getFileLoc(srcmgr, m_node->getLocation());
-      const clang::FileEntry *declfile = srcmgr.getFileEntryForID(srcmgr.getFileID(sloc));
+      const clang::OptionalFileEntryRef declfile = srcmgr.getFileEntryRefForID(srcmgr.getFileID(sloc));
       return declfile->getName().str();
     }
 
@@ -254,7 +254,7 @@ class MyFrontendAction: public clang::ASTFrontendAction {
     bool prefixable(clang::SourceLocation sloc) {
       const clang::SourceManager &srcmgr = getCompilerInstance().getSourceManager();
       clang::FileID fileid = srcmgr.getFileID(getFileLoc(srcmgr, sloc));
-      if(const clang::FileEntry *declfile = srcmgr.getFileEntryForID(fileid)) {
+      if(const clang::OptionalFileEntryRef declfile = srcmgr.getFileEntryRefForID(fileid)) {
         return prefixable (declfile->getName().str());
       }
 
@@ -406,6 +406,8 @@ class CompilationDatabase : public clang::tooling::CompilationDatabase
           // Some versions of clang ship with the full version string in the include path, others only with the major version number.
           "-I" LLVM_LIBRARY_DIR "/clang/" LLVM_VERSION_STRING "/include/",
           "-I" LLVM_LIBRARY_DIR "/clang/" + std::to_string(LLVM_VERSION_MAJOR) + "/include/",
+          // RHEL ships with a different path for the Clang headers
+          "-I/usr/lib/clang/" + std::to_string(LLVM_VERSION_MAJOR) + "/include",
           file.str()
       };
       return { clang::tooling::CompileCommand(".", file, cmdline, "") };