From 386f00db75f1b6484329f14a7002e2c0fadadb76 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Fri, 22 Mar 2019 22:19:57 +0000 Subject: [ScriptInterpreter] Make sure that PYTHONHOME is right. Summary: For the only version of Python actually supported on Darwin. Reviewers: jingham, friss, JDevlieghere, aprantl, jasonmolenda Subscribers: jdoerfert, llvm-commits, lldb-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D59719 llvm-svn: 356816 --- .../ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (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 543b8897b3f1..d17a53b201f4 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -176,6 +176,16 @@ private: static char g_python_home[] = LLDB_PYTHON_HOME; #endif Py_SetPythonHome(g_python_home); +#endif +#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 OS + // and linked with lldb. Other installation of Python may have higher priorities + // in the path, overriding PYTHONHOME and causing problems/incompatibilities. + // In order to avoid confusion, always hardcode the PythonHome to be right, + // as it's not going to change. + Py_SetPythonHome("/System/Library/Frameworks/Python.framework/Versions/2.7"); +#endif #endif } -- cgit v1.2.3