[Lldb-commits] [PATCH] D11898: Also initialize ScriptInterpreterNone if Python is disabled

[Keno Fischer via lldb-commits]

loladiro created this revision.
loladiro added a reviewer: zturner.
loladiro added a subscriber: lldb-commits.
loladiro set the repository for this revision to rL LLVM.

We get an assertion otherwise because the None Interpreter cannot be found

Repository:
  rL LLVM

http://reviews.llvm.org/D11898

Files:
  source/API/SystemInitializerFull.cpp

Index: source/API/SystemInitializerFull.cpp
===================================================================
--- source/API/SystemInitializerFull.cpp
+++ source/API/SystemInitializerFull.cpp
@@ -231,6 +231,7 @@
 SystemInitializerFull::Initialize()
 {
     SystemInitializerCommon::Initialize();
+    ScriptInterpreterNone::Initialize();
 
 #if !defined(LLDB_DISABLE_PYTHON)
     InitializeSWIG();
@@ -238,7 +239,6 @@
     // ScriptInterpreterPython::Initialize() depends on things like HostInfo 
being initialized
     // so it can compute the python directory etc, so we need to do this after
     // SystemInitializerCommon::Initialize().
-    ScriptInterpreterNone::Initialize();
     ScriptInterpreterPython::Initialize();
 #endif
 



Index: source/API/SystemInitializerFull.cpp
===================================================================
--- source/API/SystemInitializerFull.cpp
+++ source/API/SystemInitializerFull.cpp
@@ -231,6 +231,7 @@
 SystemInitializerFull::Initialize()
 {
     SystemInitializerCommon::Initialize();
+    ScriptInterpreterNone::Initialize();
 
 #if !defined(LLDB_DISABLE_PYTHON)
     InitializeSWIG();
@@ -238,7 +239,6 @@
     // ScriptInterpreterPython::Initialize() depends on things like HostInfo being initialized
     // so it can compute the python directory etc, so we need to do this after
     // SystemInitializerCommon::Initialize().
-    ScriptInterpreterNone::Initialize();
     ScriptInterpreterPython::Initialize();
 #endif
 

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits