Don't try to get the architecture up front when doing attach -w.

llvm-svn: 111302

1 files changed, 8 insertions, 5 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 3171c94652f..38f99094e85 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1135,13 +1135,16 @@ Process::Attach (const char *process_name, bool wait_for_launch)
     // Find the process and its architecture.  Make sure it matches the architecture
     // of the current Target, and if not adjust it.
     
-    ArchSpec attach_spec = GetArchSpecForExistingProcess (process_name);
-    if (attach_spec != GetTarget().GetArchitecture())
+    if (!wait_for_launch)
     {
-        // Set the architecture on the target.
-        GetTarget().SetArchitecture(attach_spec);
+        ArchSpec attach_spec = GetArchSpecForExistingProcess (process_name);
+        if (attach_spec != GetTarget().GetArchitecture())
+        {
+            // Set the architecture on the target.
+            GetTarget().SetArchitecture(attach_spec);
+        }
     }
-
+    
     Error error (WillAttachToProcessWithName(process_name, wait_for_launch));
     if (error.Success())
     {