Index: source/lldb.cpp =================================================================== --- source/lldb.cpp +++ source/lldb.cpp @@ -186,11 +186,6 @@ PlatformDarwinKernel::Initialize(); ObjectFileMachO::Initialize(); #endif - -#ifndef LLDB_DISABLE_PYTHON - ScriptInterpreterPython::InitializePrivate(); - OperatingSystemPython::Initialize(); -#endif } } @@ -206,6 +201,12 @@ if (!g_inited) { g_inited = true; + +#ifndef LLDB_DISABLE_PYTHON + ScriptInterpreterPython::InitializePrivate(); + OperatingSystemPython::Initialize(); +#endif + // Initialize LLVM and Clang llvm::InitializeAllTargets(); llvm::InitializeAllAsmPrinters(); @@ -304,9 +305,6 @@ PlatformDarwinKernel::Terminate(); SymbolVendorMacOSX::Terminate(); #endif -#ifndef LLDB_DISABLE_PYTHON - OperatingSystemPython::Terminate(); -#endif Log::Terminate(); } @@ -350,6 +348,11 @@ PlatformRemoteGDBServer::Terminate(); ProcessGDBRemote::Terminate(); DynamicLoaderStatic::Terminate(); + +#ifndef LLDB_DISABLE_PYTHON + OperatingSystemPython::Terminate(); +#endif + TerminateLLGS(); }