Author: brucem Date: Thu Sep 10 19:31:33 2015 New Revision: 247366 URL: http://llvm.org/viewvc/llvm-project?rev=247366&view=rev Log: Clean up building & linking of Process/elf-core.
Summary: * cmake/LLDBDependencies.cmake: elf-core is already included globally in LLDB_USED_LIBS, so it doesn't need to be re-added on individual platforms. * lib/Makefile: elf-core is linked on each platform, so move it to the global list of used libraries. * source/Plugins/Makefile: elf-core is built on each platform, so move it to the global list of things to build. Reviewers: clayborg, labath Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D12762 Modified: lldb/trunk/cmake/LLDBDependencies.cmake lldb/trunk/lib/Makefile lldb/trunk/source/Plugins/Makefile Modified: lldb/trunk/cmake/LLDBDependencies.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/LLDBDependencies.cmake?rev=247366&r1=247365&r2=247366&view=diff ============================================================================== --- lldb/trunk/cmake/LLDBDependencies.cmake (original) +++ lldb/trunk/cmake/LLDBDependencies.cmake Thu Sep 10 19:31:33 2015 @@ -89,7 +89,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Linux" ) list(APPEND LLDB_USED_LIBS lldbPluginProcessLinux lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif () @@ -98,7 +97,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" list(APPEND LLDB_USED_LIBS lldbPluginProcessFreeBSD lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif () Modified: lldb/trunk/lib/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=247366&r1=247365&r2=247366&view=diff ============================================================================== --- lldb/trunk/lib/Makefile (original) +++ lldb/trunk/lib/Makefile Thu Sep 10 19:31:33 2015 @@ -71,6 +71,7 @@ USEDLIBS = lldbAPI.a \ lldbPluginObjectFilePECOFF.a \ lldbPluginOSPython.a \ lldbPluginPlatformGDB.a \ + lldbPluginProcessElfCore.a \ lldbPluginProcessGDBRemote.a \ lldbPluginSymbolFileDWARF.a \ lldbPluginSymbolFileSymtab.a \ @@ -124,26 +125,22 @@ ifeq ($(HOST_OS),Darwin) lldbPluginSymbolVendorMacOSX.a \ lldbPluginProcessDarwin.a \ lldbPluginProcessMachCore.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),Linux) USEDLIBS += lldbPluginProcessLinux.a \ lldbPluginProcessPOSIX.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),MingW) - USEDLIBS += lldbPluginProcessElfCore.a \ - lldbPluginJITLoaderGDB.a + USEDLIBS += lldbPluginJITLoaderGDB.a endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) USEDLIBS += lldbPluginProcessPOSIX.a \ lldbPluginProcessFreeBSD.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif Modified: lldb/trunk/source/Plugins/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Makefile?rev=247366&r1=247365&r2=247366&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Makefile (original) +++ lldb/trunk/source/Plugins/Makefile Thu Sep 10 19:31:33 2015 @@ -18,7 +18,7 @@ PARALLEL_DIRS := ABI/MacOSX-arm ABI/MacO ObjectContainer/BSD-Archive ObjectFile/ELF ObjectFile/PECOFF \ ObjectContainer/Universal-Mach-O ObjectFile/Mach-O \ ObjectFile/JIT SymbolFile/DWARF SymbolFile/Symtab Process/Utility \ - DynamicLoader/Static Platform Process/gdb-remote \ + DynamicLoader/Static Platform Process/elf-core Process/gdb-remote \ Instruction/ARM Instruction/ARM64 Instruction/MIPS Instruction/MIPS64 \ UnwindAssembly/InstEmulation UnwindAssembly/x86 \ LanguageRuntime/CPlusPlus/ItaniumABI \ @@ -45,24 +45,20 @@ PARALLEL_DIRS += DynamicLoader/Darwin-Ke PARALLEL_DIRS += SymbolVendor/MacOSX #PARALLEL_DIRS += Process/MacOSX-User PARALLEL_DIRS += Process/mach-core -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),Linux) PARALLEL_DIRS += Process/Linux Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),MingW) -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) PARALLEL_DIRS += Process/FreeBSD Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
