From 215a31115f89c851331a822e67aa4528ba5c21e6 Mon Sep 17 00:00:00 2001 From: Stella Stamenova Date: Fri, 21 Feb 2020 14:56:17 -0800 Subject: Revert "Allow customized relative PYTHONHOME" This reverts commit 0bb90628b5f7c170689d2d3f019af773772fc649 since it is causing failures on the Windows LLDB buildbot: http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/14048 --- .../Python/ScriptInterpreterPython.cpp | 32 ++++------------------ 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index f046bcfd18eb..722af713ba43 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -277,36 +277,14 @@ public: private: void InitializePythonHome() { -#if LLDB_EMBED_PYTHON_HOME +#if defined(LLDB_PYTHON_HOME) #if PY_MAJOR_VERSION >= 3 - typedef const wchar_t* str_type; + size_t size = 0; + static wchar_t *g_python_home = Py_DecodeLocale(LLDB_PYTHON_HOME, &size); #else - typedef char* str_type; + static char g_python_home[] = LLDB_PYTHON_HOME; #endif - 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(); - } -#if PY_MAJOR_VERSION >= 3 - size_t size = 0; - return Py_DecodeLocale(absolute_python_home, &size); -#else - return strdup(absolute_python_home); -#endif - }(); - if (g_python_home != nullptr) { - Py_SetPythonHome(g_python_home); - } + Py_SetPythonHome(g_python_home); #else #if defined(__APPLE__) && PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 // For Darwin, the only Python version supported is the one shipped in the -- cgit v1.2.3