diff options
| author | Kamil Rytarowski <n54@gmx.com> | 2017-02-04 00:20:24 +0000 |
|---|---|---|
| committer | Kamil Rytarowski <n54@gmx.com> | 2017-02-04 00:20:24 +0000 |
| commit | 479153283050e51bde34a8c1fc1fd040f66d456c (patch) | |
| tree | d265237b5c33b257f97944c1616ecdf1b04e4b87 /lldb/scripts/Python/finishSwigPythonLLDB.py | |
| parent | 9809b10586b789170ceef7a3764fa18b94cc496e (diff) | |
| download | bcm5719-llvm-479153283050e51bde34a8c1fc1fd040f66d456c.tar.gz bcm5719-llvm-479153283050e51bde34a8c1fc1fd040f66d456c.zip | |
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 <The NetBSD Foundation>
Reviewers: mgorny, emaste, clayborg, joerg, labath
Reviewed By: labath
Subscribers: #lldb
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D29405
llvm-svn: 294071
Diffstat (limited to 'lldb/scripts/Python/finishSwigPythonLLDB.py')
| -rw-r--r-- | lldb/scripts/Python/finishSwigPythonLLDB.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py index 91e3a41f9ed..ff6a1318a19 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: |
