[Lldb-commits] [lldb] r151642 - in /lldb/trunk: lib/Makefile source/Plugins/Platform/Makefile

[Greg Clayton]

Author: gclayton
Date: Tue Feb 28 12:25:00 2012
New Revision: 151642

URL: http://llvm.org/viewvc/llvm-project?rev=151642&view=rev
Log:
Fix the linux build now that we link against the Linux and FreeBSD platforms.


Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/Plugins/Platform/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=151642&r1=151641&r2=151642&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Tue Feb 28 12:25:00 2012
@@ -61,7 +61,10 @@
 	clangParse.a \
 	clangSema.a \
 	clangSerialization.a \
-	LLVMMCDisassembler.a
+	LLVMMCDisassembler.a \
+	lldbPluginPlatformMacOSX.a \
+	lldbPluginPlatformLinux.a \
+	lldbPluginPlatformFreeBSD.a
 
 include $(LLDB_LEVEL)/../../Makefile.config
 
@@ -76,7 +79,6 @@
               lldbPluginObjectFileMachO.a \
               lldbPluginOperatingSystemDarwinKernel.a \
               lldbPluginSymbolVendorMacOSX.a \
-              lldbPluginPlatformMacOSX.a \
               lldbPluginProcessDarwin.a \
               lldbPluginProcessMachCore.a
 endif
@@ -85,7 +87,6 @@
   USEDLIBS += lldbPluginProcessPOSIX.a \
               lldbPluginProcessLinux.a \
               lldbPluginDynamicLoaderPOSIX.a \
-              lldbPluginPlatformLinux.a \
               lldbHostLinux.a
 endif
 
@@ -93,8 +94,7 @@
   USEDLIBS += lldbHostFreeBSD.a \
               lldbPluginDynamicLoaderPOSIX.a \
               lldbPluginProcessPOSIX.a \
-              lldbPluginProcessFreeBSD.a \
-              lldbPluginPlatformFreeBSD.a
+              lldbPluginProcessFreeBSD.a
 endif
 
 include $(LEVEL)/Makefile.common

Modified: lldb/trunk/source/Plugins/Platform/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/Makefile?rev=151642&r1=151641&r2=151642&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/Makefile (original)
+++ lldb/trunk/source/Plugins/Platform/Makefile Tue Feb 28 12:25:00 2012
@@ -11,18 +11,18 @@
 
 include $(LLDB_LEVEL)/../../Makefile.config
 
-DIRS := gdb-server
+DIRS := gdb-server MacOSX Linux FreeBSD
 
-ifeq ($(HOST_OS),Darwin)
-  DIRS += MacOSX
-endif
-
-ifeq ($(HOST_OS),Linux)
-  DIRS += Linux
-endif
-
-ifeq ($(HOST_OS),FreeBSD)
-  DIRS += FreeBSD
-endif
+# ifeq ($(HOST_OS),Darwin)
+#   DIRS += MacOSX
+# endif
+# 
+# ifeq ($(HOST_OS),Linux)
+#   DIRS += Linux
+# endif
+# 
+# ifeq ($(HOST_OS),FreeBSD)
+#   DIRS += FreeBSD
+# endif
 
 include $(LLDB_LEVEL)/Makefile