Index: source/Target/Platform.cpp
===================================================================
--- source/Target/Platform.cpp	(revision 155564)
+++ source/Target/Platform.cpp	(working copy)
@@ -118,6 +118,12 @@
     lldb::PlatformSP platform_sp;
     if (platform_name && platform_name[0])
     {
+        assert(Platform::GetHostPlatformName());
+        assert(Platform::GetDefaultPlatform());
+        // Return the default platform instance if the 'host' platform has been requested.
+        if (::strcmp(platform_name, Platform::GetHostPlatformName()) == 0)
+            return Platform::GetDefaultPlatform();
+
         create_callback = PluginManager::GetPlatformCreateCallbackForPluginName (platform_name);
         if (create_callback)
             platform_sp.reset(create_callback(true, NULL));