From: Gianfranco Costamagna Date: Sat, 31 Oct 2020 13:13:25 +0000 (+0000) Subject: print-lldb-path X-Git-Tag: archive/raspbian/1%10.0.1-8+rpi1^2~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7e0364372157377a2689e739e88d48d812663168;p=llvm-toolchain-10.git print-lldb-path Last-Update: 2020-01-21 Gbp-Pq: Name print-lldb-path.patch --- diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 06e0d5bfa..a90e47d4f 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -353,6 +353,8 @@ void ScriptInterpreterPython::ComputePythonDir( // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR); + // remove double "lib/lib" statement + std::replace(path.begin(), path.end(), '/lib/lib/', '/lib/'); #if defined(_WIN32) // This will be injected directly through FileSpec.GetDirectory().SetString(),