From 479153283050e51bde34a8c1fc1fd040f66d456c Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Sat, 4 Feb 2017 00:20:24 +0000 Subject: Install six.py conditionally Summary: The current version of LLDB installs six.py into global python library directory. This approach produces conflicts downstream with distribution's py-six copy. Introduce new configure option LLDB_USE_SYSTEM_SIX (disabled by default). Once specified as TRUE, six.py won't be installed to Python's directory. Add new option in finishSwigWrapperClasses.py, namely --useSystemSix. Sponsored by Reviewers: mgorny, emaste, clayborg, joerg, labath Reviewed By: labath Subscribers: #lldb Tags: #lldb Differential Revision: https://reviews.llvm.org/D29405 llvm-svn: 294071 --- lldb/scripts/Python/finishSwigPythonLLDB.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lldb/scripts/Python/finishSwigPythonLLDB.py') diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py index 91e3a41..ff6a131 100644 --- a/lldb/scripts/Python/finishSwigPythonLLDB.py +++ b/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -821,7 +821,9 @@ def main(vDictArgs): bOk, strMsg = create_symlinks( vDictArgs, strFrameworkPythonDir, strLldbLibDir) - if bOk: + bUseSystemSix = "--useSystemSix" in vDictArgs + + if not bUseSystemSix and bOk: bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir) if bOk: -- cgit v1.1