diff options
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/cmake/LLDBDependencies.cmake | 8 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBConfig.cmake | 3 | ||||
| -rw-r--r-- | lldb/source/Initialization/SystemInitializerCommon.cpp | 1 | ||||
| -rw-r--r-- | lldb/source/lldb.cpp | 2 | ||||
| -rw-r--r-- | lldb/tools/Makefile | 2 | ||||
| -rw-r--r-- | lldb/tools/lldb-mi/CMakeLists.txt | 2 |
6 files changed, 14 insertions, 4 deletions
diff --git a/lldb/cmake/LLDBDependencies.cmake b/lldb/cmake/LLDBDependencies.cmake index dfee39c0c18..fa79004d200 100644 --- a/lldb/cmake/LLDBDependencies.cmake +++ b/lldb/cmake/LLDBDependencies.cmake @@ -38,6 +38,7 @@ set( LLDB_USED_LIBS lldbPluginPlatformFreeBSD lldbPluginPlatformKalimba lldbPluginPlatformLinux + lldbPluginPlatformNetBSD lldbPluginPlatformPOSIX lldbPluginPlatformWindows lldbPluginObjectContainerMachOArchive @@ -105,6 +106,13 @@ if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" ) ) endif () +# NetBSD-only libraries +if ( CMAKE_SYSTEM_NAME MATCHES "NetBSD" ) + list(APPEND LLDB_USED_LIBS + lldbPluginProcessPOSIX + ) +endif () + # Darwin-only libraries if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) list(APPEND LLDB_USED_LIBS diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index 6670877d445..95c009bcf96 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -381,7 +381,8 @@ endif() # ensure we build lldb-server when an lldb target is being built. if ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR - (CMAKE_SYSTEM_NAME MATCHES "Linux")) + (CMAKE_SYSTEM_NAME MATCHES "Linux") OR + (CMAKE_SYSTEM_NAME MATCHES "NetBSD")) set(LLDB_CAN_USE_LLDB_SERVER 1) else() set(LLDB_CAN_USE_LLDB_SERVER 0) diff --git a/lldb/source/Initialization/SystemInitializerCommon.cpp b/lldb/source/Initialization/SystemInitializerCommon.cpp index dbdd765d149..72d0ae36f88 100644 --- a/lldb/source/Initialization/SystemInitializerCommon.cpp +++ b/lldb/source/Initialization/SystemInitializerCommon.cpp @@ -33,6 +33,7 @@ #include "Plugins/Platform/Linux/PlatformLinux.h" #include "Plugins/Platform/MacOSX/PlatformMacOSX.h" #include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" +#include "Plugins/Platform/NetBSD/PlatformNetBSD.h" #include "Plugins/Platform/Windows/PlatformWindows.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h" diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index 89bb485a612..1e02d2ada66 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -67,7 +67,7 @@ lldb_private::GetVersion () return g_version_string; #else - // On Linux/FreeBSD/Windows, report a version number in the same style as the clang tool. + // On platforms other than Darwin, report a version number in the same style as the clang tool. static std::string g_version_str; if (g_version_str.empty()) { diff --git a/lldb/tools/Makefile b/lldb/tools/Makefile index 85e6d174d0e..2588d87dc98 100644 --- a/lldb/tools/Makefile +++ b/lldb/tools/Makefile @@ -13,7 +13,7 @@ include $(LLDB_LEVEL)/../../Makefile.config DIRS := # enable lldb-gdbserver for supported platforms -ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD))) +ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux NetBSD GNU/kFreeBSD))) DIRS += lldb-server endif diff --git a/lldb/tools/lldb-mi/CMakeLists.txt b/lldb/tools/lldb-mi/CMakeLists.txt index 30fe8854c8b..7fd6ed199e9 100644 --- a/lldb/tools/lldb-mi/CMakeLists.txt +++ b/lldb/tools/lldb-mi/CMakeLists.txt @@ -76,7 +76,7 @@ set(LLDB_MI_SOURCES Platform.cpp ) -if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) +if ( CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD" ) add_definitions( -DIMPORT_LIBLLDB ) list(APPEND LLDB_MI_SOURCES ${LLDB_SOURCE_ROOT}/Host/common/GetOptInc.cpp |
