summaryrefslogtreecommitdiffstats
path: root/lldb/source/Interpreter/ScriptInterpreterPython.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2014-07-10 23:47:42 +0000
committerZachary Turner <zturner@google.com>2014-07-10 23:47:42 +0000
commit0ab4b48992cec1101c32e60a33d2d3c2503058f8 (patch)
tree56a87615d434932cfc683d87d2a018a7321b576d /lldb/source/Interpreter/ScriptInterpreterPython.cpp
parent0902a51bafc72030d52a3c8d55b7b983a23fee75 (diff)
downloadbcm5719-llvm-0ab4b48992cec1101c32e60a33d2d3c2503058f8.tar.gz
bcm5719-llvm-0ab4b48992cec1101c32e60a33d2d3c2503058f8.zip
Get the python scripting interface working on Windows.
This patch fixes a number of issues with embedded Python on Windows. In particular: 1) The script that builds the python modules was normalizing the case of python filenames during copies. The module name is the filename, and is case-sensitive, so this was breaking code. 2) Changes the build to not attempt to link against python27.lib (e.g. the release library) when linking against msvcrt debug library. Doing a debug build of LLDB with embedded python support now requires you to provide your own self-compiled debug version of python. 3) Don't import termios when initializing the interpreter. This is part of a larger effort to remove the dependency on termios since it is not available on Windows. This particular instance was unnecessary and unused. Reviewed by: Todd Fiala Differential Revision: http://reviews.llvm.org/D4441 llvm-svn: 212785
Diffstat (limited to 'lldb/source/Interpreter/ScriptInterpreterPython.cpp')
-rw-r--r--lldb/source/Interpreter/ScriptInterpreterPython.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 8120c4b3562..5803fe7be25 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -2621,7 +2621,7 @@ ScriptInterpreterPython::InitializePrivate ()
}
}
- PyRun_SimpleString ("sys.dont_write_bytecode = 1; import lldb.embedded_interpreter; from lldb.embedded_interpreter import run_python_interpreter; from lldb.embedded_interpreter import run_one_line; from termios import *");
+ PyRun_SimpleString ("sys.dont_write_bytecode = 1; import lldb.embedded_interpreter; from lldb.embedded_interpreter import run_python_interpreter; from lldb.embedded_interpreter import run_one_line");
if (threads_already_initialized) {
if (log)
OpenPOWER on IntegriCloud