Index: tools/lldb-platform/lldb-platform.cpp
===================================================================
--- tools/lldb-platform/lldb-platform.cpp	(revision 153608)
+++ tools/lldb-platform/lldb-platform.cpp	(working copy)
@@ -24,7 +24,7 @@
 #include "lldb/Core/ConnectionMachPort.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/StreamFile.h"
-#include "GDBRemoteCommunicationServer.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
 using namespace lldb;
 using namespace lldb_private;
Index: tools/lldb-platform/Makefile
===================================================================
--- tools/lldb-platform/Makefile	(revision 0)
+++ tools/lldb-platform/Makefile	(working copy)
@@ -0,0 +1,23 @@
+##===- tools/lldb-platform/Makefile ------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+LLDB_LEVEL := ../..
+
+TOOLNAME = lldb-platform
+
+LD.Flags += -llldb -llldbUtility
+
+include $(LLDB_LEVEL)/Makefile
+
+ifeq ($(HOST_OS),Darwin)
+	LD.Flags += -Wl,-rpath,@loader_path/../lib/
+endif
+
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD))
+	LD.Flags += -Wl,-rpath,$(LibDir)
+endif
Index: tools/Makefile
===================================================================
--- tools/Makefile	(revision 153608)
+++ tools/Makefile	(working copy)
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ..
-DIRS := driver
+DIRS := driver lldb-platform
 
 include $(LLDB_LEVEL)/Makefile