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.

llvm-svn: 143678

1 files changed, 18 insertions, 1 deletions

diff --git a/lldb/source/Core/FormatClasses.cpp b/lldb/source/Core/FormatClasses.cpp
index 04b57adabe4..30254d36994 100644
--- a/lldb/source/Core/FormatClasses.cpp
+++ b/lldb/source/Core/FormatClasses.cpp
@@ -8,12 +8,21 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
+
+#ifdef LLDB_DISABLE_PYTHON
+
+struct PyObject;
+
+#else   // #ifdef LLDB_DISABLE_PYTHON
+
 #if defined (__APPLE__)
 #include <Python/Python.h>
 #else
 #include <Python.h>
 #endif
 
+#endif  // #ifdef LLDB_DISABLE_PYTHON
+
 // C++ Includes
 #include <ostream>
 
@@ -145,6 +154,8 @@ StringSummaryFormat::GetDescription()
     return sstr.GetString();
 }
 
+#ifndef LLDB_DISABLE_PYTHON
+
 ScriptSummaryFormat::ScriptSummaryFormat(bool casc,
                                          bool skipptr,
                                          bool skipref,
@@ -187,6 +198,8 @@ ScriptSummaryFormat::GetDescription()
     
 }
 
+#endif // #ifndef LLDB_DISABLE_PYTHON
+
 std::string
 SyntheticFilter::GetDescription()
 {
@@ -231,6 +244,8 @@ SyntheticArrayView::GetDescription()
     return sstr.GetString();
 }
 
+#ifndef LLDB_DISABLE_PYTHON
+
 SyntheticScriptProvider::FrontEnd::FrontEnd(std::string pclass,
                                             lldb::ValueObjectSP be) :
     SyntheticChildrenFrontEnd(be),
@@ -253,7 +268,7 @@ SyntheticScriptProvider::FrontEnd::FrontEnd(std::string pclass,
 
 SyntheticScriptProvider::FrontEnd::~FrontEnd()
 {
-  Py_XDECREF((PyObject*)m_wrapper);
+    Py_XDECREF((PyObject*)m_wrapper);
 }
 
 lldb::ValueObjectSP
@@ -278,6 +293,8 @@ SyntheticScriptProvider::GetDescription()
     return sstr.GetString();
 }
 
+#endif // #ifndef LLDB_DISABLE_PYTHON
+
 int
 SyntheticArrayView::GetRealIndexForIndex(int i)
 {