[Lldb-commits] [lldb] 4e7c686 - [lldb] Never compile the debugserver with Clang module flags

[Raphael Isemann via lldb-commits]

Author: Raphael Isemann
Date: 2020-03-06T17:26:39-08:00
New Revision: 4e7c686e46c394b339919df9f716614675d81613

URL: https://github.com/llvm/llvm-project/commit/4e7c686e46c394b339919df9f716614675d81613
DIFF: https://github.com/llvm/llvm-project/commit/4e7c686e46c394b339919df9f716614675d81613.diff

LOG: [lldb] Never compile the debugserver with Clang module flags

Summary:
Compiling ObjC++ with Clang modules is usually not working well and compiling
the small debugserver with modules is not worth the trouble.

Reviewers: JDevlieghere

Reviewed By: JDevlieghere

Subscribers: mgorny, JDevlieghere, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D74891

Added: 
    

Modified: 
    lldb/tools/debugserver/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt
index 1dc32434ba40..8bd0ecc7d1ff 100644
--- a/lldb/tools/debugserver/CMakeLists.txt
+++ b/lldb/tools/debugserver/CMakeLists.txt
@@ -13,6 +13,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   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()