diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt
--- a/lldb/tools/debugserver/CMakeLists.txt
+++ b/lldb/tools/debugserver/CMakeLists.txt
@@ -13,6 +13,11 @@
   include(debugserverConfig)
   include(AddLLDB)
 
+  # debugserver contains ObjC++ code, so let's disable Clang modules
+  # in this subdirectory to avoid building ObjC++ modules (which often
+  # doesn't properly work).
+  remove_module_flags()
+
   set(LLDB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../../")
   include_directories(${LLDB_SOURCE_DIR}/include)
 endif()