diff options
| -rw-r--r-- | lldb/lib/Makefile | 65 | ||||
| -rw-r--r-- | lldb/tools/driver/Makefile | 4 |
2 files changed, 26 insertions, 43 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile index 3a5709f9ed6..5e37a24e6c1 100644 --- a/lldb/lib/Makefile +++ b/lldb/lib/Makefile @@ -23,23 +23,17 @@ USEDLIBS = lldbAPI.a \ 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 @@ USEDLIBS = lldbAPI.a \ 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 @@ endif 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 diff --git a/lldb/tools/driver/Makefile b/lldb/tools/driver/Makefile index a0191f7c639..08373026605 100644 --- a/lldb/tools/driver/Makefile +++ b/lldb/tools/driver/Makefile @@ -22,4 +22,8 @@ ifeq ($(HOST_OS),Darwin) 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 |
