diff options
| author | Greg Clayton <gclayton@apple.com> | 2016-03-15 22:44:07 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2016-03-15 22:44:07 +0000 |
| commit | 2591fe198593d0d914cf1d8026c4ef3009a28b39 (patch) | |
| tree | 55da6b6862ae90331bd4e906fd5f1f476767b0f4 /lldb/source/Target/Process.cpp | |
| parent | 0a5f805410f7d4b7dbdd00ea8087f512a47e845d (diff) | |
| download | bcm5719-llvm-2591fe198593d0d914cf1d8026c4ef3009a28b39.tar.gz bcm5719-llvm-2591fe198593d0d914cf1d8026c4ef3009a28b39.zip | |
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
Diffstat (limited to 'lldb/source/Target/Process.cpp')
| -rw-r--r-- | lldb/source/Target/Process.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index d138d4ae8e2..4b03176bdc9 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 |
