Index: source/Target/Target.cpp
===================================================================
--- source/Target/Target.cpp
+++ source/Target/Target.cpp
@@ -2545,7 +2545,7 @@
     Debugger &debugger = GetDebugger();
     const bool synchronous_execution = debugger.GetCommandInterpreter().GetSynchronous ();
     
-    PlatformSP platform_sp (GetPlatform());
+    const auto platform_sp = GetDebugger ().GetPlatformList ().GetSelectedPlatform ();
     
     // Finalize the file actions, and if none were given, default to opening
     // up a pseudo terminal
@@ -2577,6 +2577,7 @@
         if (log)
             log->Printf ("Target::%s asking the platform to debug the process", __FUNCTION__);
 
+        SetPlatform (platform_sp);
         // Get a weak pointer to the previous process if we have one
         ProcessWP process_wp;
         if (m_process_sp)