caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Allow customized relative PYTHONHOME"

Browse Source 
This reverts commit 0bb90628b5 since it is causing failures on the Windows LLDB buildbot:

http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/14048
This commit is contained in:
Stella Stamenova
2020-02-21 14:56:17 -08:00
parent a32d539798
commit 215a31115f
3 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View File

@@ -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