Index: source/Target/Platform.cpp
===================================================================
--- source/Target/Platform.cpp
+++ source/Target/Platform.cpp
@@ -1114,90 +1114,6 @@
                                                                   num_resumes))
                 return error;
         }
-        else if (launch_info.GetFlags().Test(eLaunchFlagGlobArguments))
-        {
-            FileSpec glob_tool_spec;
-            if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, glob_tool_spec))
-            {
-                error.SetErrorString("could not find argdumper tool");
-                return error;
-            }
-#if defined(_WIN32)
-            glob_tool_spec.AppendPathComponent("argdumper.exe");
-#else
-            glob_tool_spec.AppendPathComponent("argdumper");
-#endif
-            if (!glob_tool_spec.Exists())
-            {
-                error.SetErrorString("could not find argdumper tool");
-                return error;
-            }
-
-            std::string quoted_cmd_string;
-            launch_info.GetArguments().GetQuotedCommandString(quoted_cmd_string);
-#if defined(_WIN32)
-            std::replace(quoted_cmd_string.begin(), quoted_cmd_string.end(), '\\', '/');
-#endif
-            StreamString glob_command;
-            
-            glob_command.Printf("%s %s",
-                                glob_tool_spec.GetPath().c_str(),
-                                quoted_cmd_string.c_str());
-            
-            int status;
-            std::string output;
-            RunShellCommand(glob_command.GetData(), launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10);
-            
-            if (status != 0)
-            {
-                error.SetErrorStringWithFormat("argdumper exited with error %d", status);
-                return error;
-            }
-            
-            auto data_sp = StructuredData::ParseJSON(output);
-            if (!data_sp)
-            {
-                error.SetErrorString("invalid JSON");
-                return error;
-            }
-            
-            auto dict_sp = data_sp->GetAsDictionary();
-            if (!data_sp)
-            {
-                error.SetErrorString("invalid JSON");
-                return error;
-            }
-
-            auto args_sp = dict_sp->GetObjectForDotSeparatedPath("arguments");
-            if (!args_sp)
-            {
-                error.SetErrorString("invalid JSON");
-                return error;
-            }
-            
-            auto args_array_sp = args_sp->GetAsArray();
-            if (!args_array_sp)
-            {
-                error.SetErrorString("invalid JSON");
-                return error;
-            }
-            
-            launch_info.GetArguments().Clear();
-            
-            for (size_t i = 0;
-                 i < args_array_sp->GetSize();
-                 i++)
-            {
-                auto item_sp = args_array_sp->GetItemAtIndex(i);
-                if (!item_sp)
-                    continue;
-                auto str_sp = item_sp->GetAsString();
-                if (!str_sp)
-                    continue;
-                
-                launch_info.GetArguments().AppendArgument(str_sp->GetValue().c_str());
-            }
-        }
 
         if (log)
             log->Printf ("Platform::%s final launch_info resume count: %" PRIu32, __FUNCTION__, launch_info.GetResumeCount ());
Index: source/Target/Target.cpp
===================================================================
--- source/Target/Target.cpp
+++ source/Target/Target.cpp
@@ -37,6 +37,7 @@
 #include "lldb/Expression/ClangUserExpression.h"
 #include "lldb/Host/FileSpec.h"
 #include "lldb/Host/Host.h"
+#include "lldb/Host/HostInfo.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/OptionGroupWatchpoint.h"
@@ -2501,6 +2502,91 @@
     if (!launch_info.GetArchitecture().IsValid())
         launch_info.GetArchitecture() = GetArchitecture();
 
+    if (launch_info.GetFlags().Test(eLaunchFlagGlobArguments))
+    {
+        FileSpec glob_tool_spec;
+        if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, glob_tool_spec))
+        {
+            error.SetErrorString("could not find argdumper tool");
+            return error;
+        }
+#if defined(_WIN32)
+        glob_tool_spec.AppendPathComponent("argdumper.exe");
+#else
+        glob_tool_spec.AppendPathComponent("argdumper");
+#endif
+        if (!glob_tool_spec.Exists())
+        {
+            error.SetErrorString("could not find argdumper tool");
+            return error;
+        }
+
+        std::string quoted_cmd_string;
+        launch_info.GetArguments().GetQuotedCommandString(quoted_cmd_string);
+#if defined(_WIN32)
+        std::replace(quoted_cmd_string.begin(), quoted_cmd_string.end(), '\\', '/');
+#endif
+        StreamString glob_command;
+        
+        glob_command.Printf("%s %s",
+                            glob_tool_spec.GetPath().c_str(),
+                            quoted_cmd_string.c_str());
+        
+        int status;
+        std::string output;
+        Host::RunShellCommand(glob_command.GetData(), launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10);
+        
+        if (status != 0)
+        {
+            error.SetErrorStringWithFormat("argdumper exited with error %d", status);
+            return error;
+        }
+        
+        auto data_sp = StructuredData::ParseJSON(output);
+        if (!data_sp)
+        {
+            error.SetErrorString("invalid JSON");
+            return error;
+        }
+        
+        auto dict_sp = data_sp->GetAsDictionary();
+        if (!data_sp)
+        {
+            error.SetErrorString("invalid JSON");
+            return error;
+        }
+
+        auto args_sp = dict_sp->GetObjectForDotSeparatedPath("arguments");
+        if (!args_sp)
+        {
+            error.SetErrorString("invalid JSON");
+            return error;
+        }
+        
+        auto args_array_sp = args_sp->GetAsArray();
+        if (!args_array_sp)
+        {
+            error.SetErrorString("invalid JSON");
+            return error;
+        }
+        
+        launch_info.GetArguments().Clear();
+        
+        for (size_t i = 0;
+             i < args_array_sp->GetSize();
+             i++)
+        {
+            auto item_sp = args_array_sp->GetItemAtIndex(i);
+            if (!item_sp)
+                continue;
+            auto str_sp = item_sp->GetAsString();
+            if (!str_sp)
+                continue;
+            
+            launch_info.GetArguments().AppendArgument(str_sp->GetValue().c_str());
+        }
+    }
+
     // If we're not already connected to the process, and if we have a platform that can launch a process for debugging, go ahead and do that here.
     if (state != eStateConnected && platform_sp && platform_sp->CanDebugProcess ())
     {