From 61f471a705a5df3d581ba4905337f433bac3ba1f Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Mon, 7 Oct 2019 23:49:01 +0000 Subject: [lldb] Unifying lldb python path Based on mgorny@'s D67890 There are 3 places where python site-package path is calculated independently: 1. finishSwigPythonLLDB.py where files are written to site-packages. 2. lldb/scripts/CMakeLists.txt where site-packages are installed. 3. ScriptInterpreterPython.cpp where site-packages are added to PYTHONPATH. This change creates the path once and use it everywhere. So that they will not go out of sync. Also it provides a chance for cross compiling users to specify the right path for site-packages. Subscribers: lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D68442 llvm-svn: 373991 --- lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h index 24941ec..33ae308 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h @@ -48,8 +48,7 @@ public: protected: static void ComputePythonDirForApple(llvm::SmallVectorImpl &path); - static void ComputePythonDirForPosix(llvm::SmallVectorImpl &path); - static void ComputePythonDirForWindows(llvm::SmallVectorImpl &path); + static void ComputePythonDir(llvm::SmallVectorImpl &path); }; } // namespace lldb_private -- cgit v1.1