From 2591fe198593d0d914cf1d8026c4ef3009a28b39 Mon Sep 17 00:00:00 2001
From: Greg Clayton <gclayton@apple.com>
Date: Tue, 15 Mar 2016 22:44:07 +0000
Subject: [PATCH] Only try to load the OS plug-in after a shared library load
 if we don't already have one.

<rdar://problem/24162686>

llvm-svn: 263602
---
 lldb/source/Target/Process.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index d138d4a..4b03176 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -6410,7 +6410,10 @@ Process::ModulesDidLoad (ModuleList &module_list)
             language_runtime_sp->ModulesDidLoad(module_list);
     }
 
-    LoadOperatingSystemPlugin(false);
+    // If we don't have an operating system plug-in, try to load one since
+    // loading shared libraries might cause a new one to try and load
+    if (!m_os_ap)
+        LoadOperatingSystemPlugin(false);
 }
 
 void
-- 
2.7.4