Author: Raphael Isemann Date: 2020-04-27T16:04:19+02:00 New Revision: ff5264f0c6f026b25e2d91d0f5d5377a156c1f40
URL: https://github.com/llvm/llvm-project/commit/ff5264f0c6f026b25e2d91d0f5d5377a156c1f40 DIFF: https://github.com/llvm/llvm-project/commit/ff5264f0c6f026b25e2d91d0f5d5377a156c1f40.diff LOG: [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. Added: Modified: lldb/tools/debugserver/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt index 8bd0ecc7d1ff..fc23cf3c7e20 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) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
