Author: Pavel Labath Date: 2025-06-12T15:27:27+02:00 New Revision: 622df892b844749440124167e8eee9e652fba613
URL: https://github.com/llvm/llvm-project/commit/622df892b844749440124167e8eee9e652fba613 DIFF: https://github.com/llvm/llvm-project/commit/622df892b844749440124167e8eee9e652fba613.diff LOG: [lldb/cmake] Remove EXTRA_CXXFLAGS arg (#143731) We have one library using this and three libraries directly calling `target_compile_options`. Might as well standardize on the latter. Added: Modified: lldb/cmake/modules/AddLLDB.cmake lldb/source/Plugins/Language/ObjC/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 0108fb22e5a03..28bf8d816d89a 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -41,7 +41,7 @@ function(add_lldb_library name) cmake_parse_arguments(PARAM "MODULE;SHARED;STATIC;OBJECT;PLUGIN;FRAMEWORK;NO_INTERNAL_DEPENDENCIES;NO_PLUGIN_DEPENDENCIES" "INSTALL_PREFIX" - "EXTRA_CXXFLAGS;LINK_LIBS;CLANG_LIBS" + "LINK_LIBS;CLANG_LIBS" ${ARGN}) if(PARAM_NO_INTERNAL_DEPENDENCIES) @@ -130,9 +130,6 @@ function(add_lldb_library name) add_dependencies(${name} clang-tablegen-targets) endif() - # Add in any extra C++ compilation flags for this library. - target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS}) - if(PARAM_PLUGIN) get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY) if(EXISTS ${parent_dir}) diff --git a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt index 93c23fd32524b..b9fc5ce754c49 100644 --- a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt +++ b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt @@ -1,13 +1,3 @@ -set(EXTRA_CXXFLAGS "") - -if (CXX_SUPPORTS_NO_GNU_ANONYMOUS_STRUCT) - set(EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS} -Wno-gnu-anonymous-struct) -endif () - -if (CXX_SUPPORTS_NO_NESTED_ANON_TYPES) - set(EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS} -Wno-nested-anon-types) -endif () - add_lldb_library(lldbPluginObjCLanguage PLUGIN ObjCLanguage.cpp CF.cpp @@ -36,6 +26,14 @@ add_lldb_library(lldbPluginObjCLanguage PLUGIN lldbPluginTypeSystemClang CLANG_LIBS clangAST - - EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS} ) + +if (CXX_SUPPORTS_NO_GNU_ANONYMOUS_STRUCT) + target_compile_options(lldbPluginObjCLanguage + PRIVATE -Wno-gnu-anonymous-struct) +endif () + +if (CXX_SUPPORTS_NO_NESTED_ANON_TYPES) + target_compile_options(lldbPluginObjCLanguage + PRIVATE -Wno-nested-anon-types) +endif () _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
