summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Fiala <todd.fiala@gmail.com>2016-05-27 04:04:52 +0000
committerTodd Fiala <todd.fiala@gmail.com>2016-05-27 04:04:52 +0000
commit873a2ab4becf79cb9b84afdd95c03e8b22e368f5 (patch)
tree5dded9f82ecb7d406e599bbb82f02a9cffa0fd33
parentb393d9535981685f2741107784eeab8e650c567c (diff)
downloadbcm5719-llvm-873a2ab4becf79cb9b84afdd95c03e8b22e368f5.tar.gz
bcm5719-llvm-873a2ab4becf79cb9b84afdd95c03e8b22e368f5.zip
fix up lldb-server platform on Apple hosts
r259714 introduces the transport method into the URL passed to the gdb-remote stub. On debugserver, this is not supported and prevented debugserver from being launched by lldb-server in platform mode. This change skips the transport method addition from r259714 when on Apple hosts. llvm-svn: 270961
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
index e16e9e4a3b8..eba237c17c9 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
@@ -132,7 +132,10 @@ GDBRemoteCommunicationServerPlatform::LaunchGDBServer(const lldb_private::Args&
assert(ok);
std::ostringstream url;
+ // debugserver does not accept the URL scheme prefix.
+#if !defined(__APPLE__)
url << m_socket_scheme << "://";
+#endif
uint16_t* port_ptr = &port;
if (m_socket_protocol == Socket::ProtocolTcp)
url << platform_ip << ":" << port;
OpenPOWER on IntegriCloud