[Lldb-commits] [lldb] r108025 - in /lldb/trunk: lib/Makefile tools/driver/Makefile

[Eli Friedman]

Author: efriedma
Date: Fri Jul  9 17:11:43 2010
New Revision: 108025

URL: http://llvm.org/viewvc/llvm-project?rev=108025&view=rev
Log:
Make current Makefiles work on Linux (at least, they work for me).  Please
tell me if this breaks anything.


Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/tools/driver/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=108025&r1=108024&r2=108025&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Fri Jul  9 17:11:43 2010
@@ -23,23 +23,17 @@
 	lldbCommands.a \
 	lldbCore.a \
 	lldbExpression.a \
-	lldbHostMacOSX.a \
 	lldbHostPosix.a \
 	lldbInitAndLog.a \
 	lldbInterpreter.a \
 	lldbPluginABIMacOSX_i386.a \
 	lldbPluginABISysV_x86_64.a \
 	lldbPluginDisassemblerLLVM.a \
-	lldbPluginDynamicLoaderMacOSX.a \
 	lldbPluginObjectContainerBSDArchive.a \
-	lldbPluginObjectContainerUniversalMachO.a \
 	lldbPluginObjectFileELF.a \
-	lldbPluginObjectFileMachO.a \
-	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
 	lldbPluginSymbolVendorMacOSX.a \
-	lldbPluginUtility.a \
 	lldbSymbol.a \
 	lldbTarget.a \
 	lldbUtility.a \
@@ -58,47 +52,30 @@
 	clangSema.a \
 	CompilerDriver.a \
 	EnhancedDisassembly.a \
-	LLVMAnalysis.a \
-	LLVMArchive.a \
-	LLVMARMAsmParser.a \
-	LLVMARMAsmPrinter.a \
-	LLVMARMCodeGen.a \
-	LLVMARMDisassembler.a \
-	LLVMARMInfo.a \
-	LLVMAsmParser.a \
-	LLVMAsmPrinter.a \
-	LLVMBitReader.a \
-	LLVMBitWriter.a \
-	LLVMCodeGen.a \
-	LLVMCore.a \
-	LLVMExecutionEngine.a \
-	LLVMInstCombine.a \
-	LLVMInstrumentation.a \
-	LLVMipa.a \
-	LLVMInterpreter.a \
-	LLVMipo.a \
-	LLVMJIT.a \
-	LLVMLinker.a \
-	LLVMMC.a \
-	LLVMMCParser.a \
-	LLVMScalarOpts.a \
-	LLVMSelectionDAG.a \
-	LLVMSupport.a \
-	LLVMSystem.a \
-	LLVMTarget.a \
-	LLVMTransformUtils.a \
-	LLVMX86AsmParser.a \
-	LLVMX86AsmPrinter.a \
-	LLVMX86CodeGen.a \
-	LLVMX86Disassembler.a \
-	LLVMX86Info.a \
 	clangChecker.a
 
-include $(LEVEL)/Makefile.common
+include $(LLDB_LEVEL)/../../Makefile.config
+
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
+                   ipo selectiondag jit
+
+ifeq ($(HOST_OS),Darwin)
+  USEDLIBS += lldbHostMacOSX.a \
+              lldbPluginDynamicLoaderMacOSX.a \
+              lldbPluginObjectContainerUniversalMachO.a \
+              lldbPluginObjectFileMachO.a \
+              lldbPluginProcessGDBRemote.a \
+              lldbPluginUtility.a
+endif
+
+ifeq ($(HOST_OS),Linux)
+  USEDLIBS += lldbHostLinux.a
+endif
 
-LLVMLibsOptions += -Wl,-all_load -v
+include $(LEVEL)/Makefile.common
 
 ifeq ($(HOST_OS),Darwin)
+    LLVMLibsOptions += -Wl,-all_load
     # set dylib internal version number to llvmCore submission number
     ifdef LLDB_SUBMIT_VERSION
         LLVMLibsOptions += -Wl,-current_version \
@@ -121,8 +98,10 @@
 
 ifeq ($(HOST_OS), Linux)
     # Include everything from the .a's into the shared library.
-    LLVMLibsOptions := -Wl,--whole-archive $(LLDBLibsOptions) \
+    ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
                        -Wl,--no-whole-archive
     # Don't allow unresolved symbols.
     LLVMLibsOptions += -Wl,--no-undefined
+    # Link in python
+    LD.Flags += -lpython2.6
 endif

Modified: lldb/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Makefile?rev=108025&r1=108024&r2=108025&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Makefile (original)
+++ lldb/trunk/tools/driver/Makefile Fri Jul  9 17:11:43 2010
@@ -22,4 +22,8 @@
 	LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,lldb-Info.plist
 endif
 
+ifeq ($(HOST_OS),Linux)
+	LD.Flags += -Wl,-rpath,$(LibDir)
+endif
+
 include $(LLDB_LEVEL)/Makefile