https://github.com/abhina-sree updated
https://github.com/llvm/llvm-project/pull/75637
>From fa5de46426920ed3592fcd0b0dd5b810b62d22c1 Mon Sep 17 00:00:00 2001
From: Abhina Sreeskantharajan <abhina.sreeskanthara...@ibm.com>
Date: Fri, 15 Dec 2023 13:13:24 -0500
Subject: [PATCH] check if we have dlfcn.h and dladdr
---
clang/tools/libclang/CIndexer.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/clang/tools/libclang/CIndexer.cpp
b/clang/tools/libclang/CIndexer.cpp
index 77da2e4fa5ead0..6f6a3cdccf2528 100644
--- a/clang/tools/libclang/CIndexer.cpp
+++ b/clang/tools/libclang/CIndexer.cpp
@@ -17,6 +17,7 @@
#include "clang/Driver/Driver.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
+#include "llvm/Config/config.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MD5.h"
#include "llvm/Support/Path.h"
@@ -125,13 +126,19 @@ const std::string &CIndexer::getClangResourcesPath() {
#elif defined(_AIX)
getClangResourcesPathImplAIX(LibClangPath);
#else
+ bool pathFound = false;
+#if defined(HAVE_DLFCN_H) && defined(HAVE_DLADDR)
Dl_info info;
- std::string Path;
// This silly cast below avoids a C++ warning.
if (dladdr((void *)(uintptr_t)clang_createTranslationUnit, &info) != 0) {
// We now have the CIndex directory, locate clang relative to it.
LibClangPath += info.dli_fname;
- } else if (!(Path = llvm::sys::fs::getMainExecutable(nullptr,
nullptr)).empty()) {
+ pathFound = true;
+ }
+#endif
+ std::string Path;
+ if (!pathFound &&
+ !(Path = llvm::sys::fs::getMainExecutable(nullptr, nullptr)).empty()) {
// If we can't get the path using dladdr, try to get the main executable
// path. This may be needed when we're statically linking libclang with
// musl libc, for example.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
