Author: tfiala Date: Fri Jul 4 01:58:01 2014 New Revision: 212320 URL: http://llvm.org/viewvc/llvm-project?rev=212320&view=rev Log: Windows build fixes and removal of endlessly recursive termination function.
This change removes the ScriptInterpreter::TerminateInterpreter() call which ended up endlessly calling itself as things currently stand. It also cleans up some other Windows-related cmake changes. See http://lists.cs.uiuc.edu/pipermail/lldb-commits/Week-of-Mon-20140630/011544.html for more details. Change by Zachary Turner Modified: lldb/trunk/CMakeLists.txt lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h lldb/trunk/source/Interpreter/ScriptInterpreter.cpp Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=212320&r1=212319&r2=212320&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Fri Jul 4 01:58:01 2014 @@ -1,15 +1,22 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) set(LLDB_DEFAULT_DISABLE_PYTHON 1) set(LLDB_DEFAULT_DISABLE_CURSES 1) + if (LLDB_DISABLE_PYTHON) + set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) + else() + set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 1) + endif() else() set(LLDB_DEFAULT_DISABLE_PYTHON 0) set(LLDB_DEFAULT_DISABLE_CURSES 0) + set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) endif() set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL "Disables the Python scripting integration.") set(LLDB_DISABLE_CURSES ${LLDB_DEFAULT_DISABLE_CURSES} CACHE BOOL "Disables the Curses integration.") -set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0 CACHE BOOL + +set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ${LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION} CACHE BOOL "Enables using new Python scripts for SWIG API generation .") # If we are not building as a part of LLVM, build LLDB as an @@ -84,6 +91,10 @@ if (LLDB_DISABLE_PYTHON) add_definitions( -DLLDB_DISABLE_PYTHON ) endif() +if ((NOT MSVC) OR MSVC12) + add_definitions( -DHAVE_ROUND ) +endif() + if (LLDB_DISABLE_CURSES) add_definitions( -DLLDB_DISABLE_CURSES ) endif() Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h?rev=212320&r1=212319&r2=212320&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h (original) +++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h Fri Jul 4 01:58:01 2014 @@ -567,9 +567,6 @@ public: SWIGPythonScriptKeyword_Frame swig_run_script_keyword_frame, SWIGPython_GetDynamicSetting swig_plugin_get); - static void - TerminateInterpreter (); - virtual void ResetOutputFileHandle (FILE *new_fh) { } //By default, do nothing. Modified: lldb/trunk/source/Interpreter/ScriptInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreter.cpp?rev=212320&r1=212319&r2=212320&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/ScriptInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/ScriptInterpreter.cpp Fri Jul 4 01:58:01 2014 @@ -132,12 +132,3 @@ ScriptInterpreter::InitializeInterpreter swig_plugin_get); #endif // #ifndef LLDB_DISABLE_PYTHON } - -void -ScriptInterpreter::TerminateInterpreter () -{ -#ifndef LLDB_DISABLE_PYTHON - ScriptInterpreterPython::TerminateInterpreter (); -#endif // #ifndef LLDB_DISABLE_PYTHON -} - _______________________________________________ lldb-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
