Author: jmolenda
Date: Thu Aug 21 18:22:33 2014
New Revision: 216243
URL: http://llvm.org/viewvc/llvm-project?rev=216243&view=rev
Log:
Two small fixes to get Mac native + debugserver working after the
HostInfo et al changes from Zachary. Changes suggested by Zachary
- fixes the problems I was seeing.
Modified:
lldb/trunk/source/Host/macosx/Host.mm
lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Modified: lldb/trunk/source/Host/macosx/Host.mm
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=216243&r1=216242&r2=216243&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Thu Aug 21 18:22:33 2014
@@ -1255,7 +1255,7 @@ LaunchProcessXPC (const char *exe_path,
const char *xpc_service = nil;
bool send_auth = false;
AuthorizationExternalForm extForm;
- if ((requested_uid == UINT32_MAX) || (requested_uid ==
Host::GetEffectiveUserID()))
+ if ((requested_uid == UINT32_MAX) || (requested_uid ==
HostInfo::GetEffectiveUserID()))
{
xpc_service = "com.apple.lldb.launcherXPCService";
}
@@ -1392,7 +1392,7 @@ ShouldLaunchUsingXPC(ProcessLaunchInfo &
#if !NO_XPC_SERVICES
bool launchingAsRoot = launch_info.GetUserID() == 0;
- bool currentUserIsRoot = Host::GetEffectiveUserID() == 0;
+ bool currentUserIsRoot = HostInfo::GetEffectiveUserID() == 0;
if (launchingAsRoot && !currentUserIsRoot)
{
Modified:
lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=216243&r1=216242&r2=216243&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
(original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Thu
Aug 21 18:22:33 2014
@@ -687,7 +687,7 @@ GDBRemoteCommunication::StartDebugserver
// directory.
if (HostInfo::GetLLDBPath(ePathTypeSupportExecutableDir,
debugserver_file_spec))
{
-
debugserver_file_spec.GetFilename().SetCString(DEBUGSERVER_BASENAME);
+ debugserver_file_spec.AppendPathComponent (DEBUGSERVER_BASENAME);
debugserver_exists = debugserver_file_spec.Exists();
if (debugserver_exists)
{
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
