[Lldb-commits] [lldb] r220761 - Clarify the launch style for debugserver to use.

[Jason Molenda]

Author: jmolenda
Date: Mon Oct 27 22:15:33 2014
New Revision: 220761

URL: http://llvm.org/viewvc/llvm-project?rev=220761&view=rev
Log:
Clarify the launch style for debugserver to use.
<rdar://problem/18786645> 

Modified:
    lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm
    lldb/trunk/tools/debugserver/source/com.apple.debugserver.applist.plist
    lldb/trunk/tools/debugserver/source/com.apple.debugserver.plist

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm?rev=220761&r1=220760&r2=220761&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm Mon Oct 27 22:15:33 2014
@@ -2000,9 +2000,7 @@ MachProcess::LaunchForDebug
                     break; // We tried a BKS launch, but didn't succeed lets get out
             }
         }
-        // In case the executable name has a ".app" fragment which confuses our debugserver,
-        // let's do an intentional fallthrough here...
-        launch_flavor = eLaunchFlavorPosixSpawn;
+        break;
 #endif
 #ifdef WITH_SPRINGBOARD
 
@@ -2032,9 +2030,7 @@ MachProcess::LaunchForDebug
                     break; // We tried a springboard launch, but didn't succeed lets get out
             }
         }
-        // In case the executable name has a ".app" fragment which confuses our debugserver,
-        // let's do an intentional fallthrough here...
-        launch_flavor = eLaunchFlavorPosixSpawn;
+        break;
 
 #endif
 

Modified: lldb/trunk/tools/debugserver/source/com.apple.debugserver.applist.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/com.apple.debugserver.applist.plist?rev=220761&r1=220760&r2=220761&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/com.apple.debugserver.applist.plist (original)
+++ lldb/trunk/tools/debugserver/source/com.apple.debugserver.applist.plist Mon Oct 27 22:15:33 2014
@@ -10,7 +10,8 @@
 	<array>
 		<string>/Developer/usr/bin/debugserver</string>
 		<string>--lockdown</string>
-		<string>--applist</string>
+        <string>--applist</string>
+        <string>--launch=backboard</string>
 	</array>
 </dict>
 </plist>

Modified: lldb/trunk/tools/debugserver/source/com.apple.debugserver.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/com.apple.debugserver.plist?rev=220761&r1=220760&r2=220761&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/com.apple.debugserver.plist (original)
+++ lldb/trunk/tools/debugserver/source/com.apple.debugserver.plist Mon Oct 27 22:15:33 2014
@@ -10,6 +10,7 @@
 	<array>
 		<string>/Developer/usr/bin/debugserver</string>
 		<string>--lockdown</string>
+        <string>--launch=backboard</string>
 	</array>
 </dict>
 </plist>