From bc3f9fc2b6e3f28cf53b7f21ed498fb6439b64ed Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 23 Sep 2024 13:23:31 +0200 Subject: [PATCH] print-lldb-path Last-Update: 2023-01-19 Gbp-Pq: Topic lldb Gbp-Pq: Name print-lldb-path.patch --- lldb/bindings/python/get-python-config.py | 15 ++++++++++++++- .../Python/ScriptInterpreterPython.cpp | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lldb/bindings/python/get-python-config.py b/lldb/bindings/python/get-python-config.py index ae84cbb121..e702a3008c 100755 --- a/lldb/bindings/python/get-python-config.py +++ b/lldb/bindings/python/get-python-config.py @@ -16,6 +16,7 @@ def relpath_nodots(path, base): def main(): + import sysconfig parser = argparse.ArgumentParser(description="extract cmake variables from python") parser.add_argument("variable_name") args = parser.parse_args() @@ -32,7 +33,19 @@ def main(): # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info # to figure out where it is. try: - print(relpath_nodots(sysconfig.get_path("platlib"), sys.prefix)) + if hasattr(sysconfig, 'get_default_scheme'): + scheme = sysconfig.get_default_scheme() + else: + scheme = sysconfig._get_default_scheme() + if scheme == 'posix_local': + # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ + scheme = 'posix_prefix' + path = sysconfig.get_path('purelib', scheme) + else: + from distutils import sysconfig + path = sysconfig.get_python_lib(0, 0) + + print(relpath_nodots(path, sys.prefix)) except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index ef7a2c128a..1385c628e4 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -255,6 +255,7 @@ void ScriptInterpreterPython::ComputePythonDir( // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); + llvm::sys::path::append(path, "/llvm-" + std::to_string(LLVM_VERSION_MAJOR)); llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR); #if defined(_WIN32) -- 2.30.2