diff options
| author | Zachary Turner <zturner@google.com> | 2015-11-04 01:26:48 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-11-04 01:26:48 +0000 |
| commit | ff836df6a478feaa03566248c1191098c085cd72 (patch) | |
| tree | 86381f3b71523e26d23b60b80b5a589aaea701eb /lldb/scripts/Python/finishSwigPythonLLDB.py | |
| parent | fe617b1e99916336269da675a16ccd0b511e8493 (diff) | |
| download | llvm-ff836df6a478feaa03566248c1191098c085cd72.zip llvm-ff836df6a478feaa03566248c1191098c085cd72.tar.gz llvm-ff836df6a478feaa03566248c1191098c085cd72.tar.bz2 | |
Revert "Python 3 - Don't add the _d suffix to the symlink on Windows."
This reverts commit e59c95ca936f5a0a8abb987b8605fd8bf82b03b6.
This was a mistake on my part. The real problem was with my
environment. I was using a release interpreter to try to load
my debug extension module. I noticed this after I finally managed
to get into my extension module's init method, and then it segfaulted
with heap errors due to mismatched CRT (debug vs. release)
llvm-svn: 252030
Diffstat (limited to 'lldb/scripts/Python/finishSwigPythonLLDB.py')
| -rw-r--r-- | lldb/scripts/Python/finishSwigPythonLLDB.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py index d6eb10d..45cb8b9 100644 --- a/lldb/scripts/Python/finishSwigPythonLLDB.py +++ b/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -350,10 +350,8 @@ def make_symlink_liblldb( vDictArgs, vstrFrameworkPythonDir, vstrLiblldbFileName if eOSType == utilsOsType.EnumOsType.Windows: # When importing an extension module using a debug version of python, you # write, for example, "import foo", but the interpreter searches for - # "foo_d.pyd". This only applies for Python 2, however. Python 3 does - # not use the _d suffix for extension modules. - import six - if is_debug_interpreter() and six.PY2: + # "foo_d.pyd" + if is_debug_interpreter(): strTarget += "_d"; strTarget += ".pyd"; else: |