commit 3e4238d47a6d1a3106f357d2e7b495870721c7ae
author Greg Clayton <gclayton@apple.com> Fri Nov 04 03:34:56 2011 +0000
committer Greg Clayton <gclayton@apple.com> Fri Nov 04 03:34:56 2011 +0000
tree 34f34a8fee4fa470bf7ec65d53c2a2a9b529866d
parent fa9e6dd370331db1fdef7420e43c5aaacf0b2f65

Fixed the Xcode project building of LLVM to be a bit more user friendly:

- If you download and build the sources in the Xcode project, x86_64 builds
  by default using the "llvm.zip" checkpointed LLVM.
- If you delete the "lldb/llvm.zip" and the "lldb/llvm" folder, and build the
  Xcode project will download the right LLVM sources and build them from 
  scratch
- If you have a "lldb/llvm" folder already that contains a "lldb/llvm/lib"
  directory, we will use the sources you have placed in the LLDB directory.
  
Python can now be disabled for platforms that don't support it. 

Changed the way the libllvmclang.a files get used. They now all get built into
arch specific directories and never get merged into universal binaries as this
was causing issues where you would have to go and delete the file if you wanted
to build an extra architecture slice.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@143678 91177308-0d34-0410-b5e6-96231b3b80d8

source/Interpreter/CommandInterpreter.cpp

diff --git a/source/Interpreter/CommandInterpreter.cpp b/source/Interpreter/CommandInterpreter.cpp
index 0b9e4db..b94c409 100644
--- a/source/Interpreter/CommandInterpreter.cpp
+++ b/source/Interpreter/CommandInterpreter.cpp
@@ -2276,12 +2276,16 @@
     lldb::ScriptLanguage script_lang = GetDebugger().GetScriptLanguage();
     switch (script_lang)
     {
+        case eScriptLanguagePython:
+#ifndef LLDB_DISABLE_PYTHON
+            m_script_interpreter_ap.reset (new ScriptInterpreterPython (*this));
+            break;
+#else
+            // Fall through to the None case when python is disabled
+#endif
         case eScriptLanguageNone:
             m_script_interpreter_ap.reset (new ScriptInterpreterNone (*this));
             break;
-        case eScriptLanguagePython:
-            m_script_interpreter_ap.reset (new ScriptInterpreterPython (*this));
-            break;
         default:
             break;
     };

source/Interpreter/ScriptInterpreter.cpp

diff --git a/source/Interpreter/ScriptInterpreter.cpp b/source/Interpreter/ScriptInterpreter.cpp
index e125d65..eb7ddc2 100644
--- a/source/Interpreter/ScriptInterpreter.cpp
+++ b/source/Interpreter/ScriptInterpreter.cpp
@@ -84,7 +84,6 @@
         case eScriptLanguagePython:
             return_value = "Python";
             break;
-        
     }
 
     return return_value;
@@ -103,6 +102,7 @@
                                           SWIGPythonCallCommand python_swig_call_command,
                                           SWIGPythonCallModuleInit python_swig_call_mod_init)
 {
+#ifndef LLDB_DISABLE_PYTHON
     ScriptInterpreterPython::InitializeInterpreter (python_swig_init_callback, 
                                                     python_swig_breakpoint_callback,
                                                     python_swig_typescript_callback,
@@ -114,11 +114,14 @@
                                                     python_swig_update_provider,
                                                     python_swig_call_command,
                                                     python_swig_call_mod_init);
+#endif // #ifndef LLDB_DISABLE_PYTHON
 }
 
 void
 ScriptInterpreter::TerminateInterpreter ()
 {
+#ifndef LLDB_DISABLE_PYTHON
     ScriptInterpreterPython::TerminateInterpreter ();
+#endif // #ifndef LLDB_DISABLE_PYTHON
 }
 

source/Interpreter/ScriptInterpreterPython.cpp

diff --git a/source/Interpreter/ScriptInterpreterPython.cpp b/source/Interpreter/ScriptInterpreterPython.cpp
index ee35690..213a69e 100644
--- a/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/source/Interpreter/ScriptInterpreterPython.cpp
@@ -9,6 +9,11 @@
 
 // In order to guarantee correct working with Python, Python.h *MUST* be
 // the *FIRST* header file included here.
+#ifdef LLDB_DISABLE_PYTHON
+
+// Python is disabled in this build
+
+#else
 
 #if defined (__APPLE__)
 #include <Python/Python.h>
@@ -1998,3 +2003,5 @@
 //    //
 ////    Py_Finalize ();
 //}
+
+#endif // #ifdef LLDB_DISABLE_PYTHON