From ff5264f0c6f026b25e2d91d0f5d5377a156c1f40 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Mon, 27 Apr 2020 16:03:37 +0200 Subject: [PATCH] [lldb][cmake] Move the remove_module_flags call to the right place in debugserver's CMakeLists This code should always be executed, not just when building the debugserver on its own. Fixes the modules build when building LLVM+LLDB together. --- lldb/tools/debugserver/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt index 8bd0ecc..fc23cf3 100644 --- a/lldb/tools/debugserver/CMakeLists.txt +++ b/lldb/tools/debugserver/CMakeLists.txt @@ -13,13 +13,13 @@ 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() +# 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() + add_subdirectory(source) -- 2.7.4