summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2018-06-20 09:00:30 +0000
committerPavel Labath <labath@google.com>2018-06-20 09:00:30 +0000
commitaf8b24fa410824dd8fa37a979bbe500ffc569c94 (patch)
tree3b79fd1950687a500fa4f2b54e8daabe6965c1e9
parentef6cef5b57f9ae40c1e33c0956aee7a0c76d07ed (diff)
downloadbcm5719-llvm-af8b24fa410824dd8fa37a979bbe500ffc569c94.tar.gz
bcm5719-llvm-af8b24fa410824dd8fa37a979bbe500ffc569c94.zip
Fix windows build broken by r335104
lldb-python.h needs to be included first to work around some incompatibilities between windows and python headers. llvm-svn: 335106
-rw-r--r--lldb/source/API/SBHostOS.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/lldb/source/API/SBHostOS.cpp b/lldb/source/API/SBHostOS.cpp
index 812d6a7e4b6..e56951df43b 100644
--- a/lldb/source/API/SBHostOS.cpp
+++ b/lldb/source/API/SBHostOS.cpp
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+#ifndef LLDB_DISABLE_PYTHON
+#include "Plugins/ScriptInterpreter/Python/lldb-python.h"
+#endif
+
#include "lldb/API/SBHostOS.h"
#include "lldb/API/SBError.h"
#include "lldb/Host/Host.h"
@@ -18,7 +22,9 @@
#include "lldb/Utility/Log.h"
#include "Plugins/ExpressionParser/Clang/ClangHost.h"
+#ifndef LLDB_DISABLE_PYTHON
#include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h"
+#endif
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Path.h"
@@ -49,7 +55,9 @@ SBFileSpec SBHostOS::GetLLDBPath(lldb::PathType path_type) {
fspec = HostInfo::GetHeaderDir();
break;
case ePathTypePythonDir:
+#ifndef LLDB_DISABLE_PYTHON
fspec = ScriptInterpreterPython::GetPythonDir();
+#endif
break;
case ePathTypeLLDBSystemPlugins:
fspec = HostInfo::GetSystemPluginDir();
OpenPOWER on IntegriCloud