maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Pavel Labath 2018-06-20 09:00:30 +00:00
parent ef6cef5b57
commit af8b24fa41
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/API/SBHostOS.cpp
View File

@ -7,6 +7,10 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLDB_DISABLE_PYTHON
#include "Plugins/ScriptInterpreter/Python/lldb-python.h"
#endif
#include "lldb/API/SBHostOS.h" #include "lldb/API/SBHostOS.h"
#include "lldb/API/SBError.h" #include "lldb/API/SBError.h"
#include "lldb/Host/Host.h" #include "lldb/Host/Host.h"
@ -18,7 +22,9 @@
#include "lldb/Utility/Log.h" #include "lldb/Utility/Log.h"
#include "Plugins/ExpressionParser/Clang/ClangHost.h" #include "Plugins/ExpressionParser/Clang/ClangHost.h"
#ifndef LLDB_DISABLE_PYTHON
#include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h" #include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h"
#endif
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"
#include "llvm/Support/Path.h" #include "llvm/Support/Path.h"
@ -49,7 +55,9 @@ SBFileSpec SBHostOS::GetLLDBPath(lldb::PathType path_type) {
fspec = HostInfo::GetHeaderDir(); fspec = HostInfo::GetHeaderDir();
break; break;
case ePathTypePythonDir: case ePathTypePythonDir:
#ifndef LLDB_DISABLE_PYTHON
fspec = ScriptInterpreterPython::GetPythonDir(); fspec = ScriptInterpreterPython::GetPythonDir();
#endif
break; break;
case ePathTypeLLDBSystemPlugins: case ePathTypeLLDBSystemPlugins:
fspec = HostInfo::GetSystemPluginDir(); fspec = HostInfo::GetSystemPluginDir();