[Lldb-commits] [lldb] [lldb] Use Py_InitializeFromConfig with Python >= 3.8 (NFC) (PR #114112)
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Wed Oct 30 06:58:20 PDT 2024
================
@@ -92,7 +92,38 @@ namespace {
struct InitializePythonRAII {
public:
InitializePythonRAII() {
- InitializePythonHome();
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8) || (PY_MAJOR_VERSION > 3)
+ PyConfig config;
+ PyConfig_InitPythonConfig(&config);
+#endif
+
+#if LLDB_EMBED_PYTHON_HOME
+ typedef wchar_t *str_type;
+ static str_type g_python_home = []() -> str_type {
+ const char *lldb_python_home = LLDB_PYTHON_HOME;
+ const char *absolute_python_home = nullptr;
+ llvm::SmallString<64> path;
+ if (llvm::sys::path::is_absolute(lldb_python_home)) {
+ absolute_python_home = lldb_python_home;
+ } else {
+ FileSpec spec = HostInfo::GetShlibDir();
+ if (!spec)
+ return nullptr;
+ spec.GetPath(path);
+ llvm::sys::path::append(path, lldb_python_home);
+ absolute_python_home = path.c_str();
+ }
+ size_t size = 0;
+ return Py_DecodeLocale(absolute_python_home, &size);
+ }();
+ if (g_python_home != nullptr) {
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8)
----------------
JDevlieghere wrote:
Yes, here it's actually missing.
https://github.com/llvm/llvm-project/pull/114112
More information about the lldb-commits
mailing list