Skip to content

Commit d7a4d97

Browse files
labathtomtor
authored andcommitted
[lldb/cmake] Remove EXTRA_CXXFLAGS arg (llvm#143731)
We have one library using this and three libraries directly calling `target_compile_options`. Might as well standardize on the latter.
1 parent b823448 commit d7a4d97

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function(add_lldb_library name)
4141
cmake_parse_arguments(PARAM
4242
"MODULE;SHARED;STATIC;OBJECT;PLUGIN;FRAMEWORK;NO_INTERNAL_DEPENDENCIES;NO_PLUGIN_DEPENDENCIES"
4343
"INSTALL_PREFIX"
44-
"EXTRA_CXXFLAGS;LINK_LIBS;CLANG_LIBS"
44+
"LINK_LIBS;CLANG_LIBS"
4545
${ARGN})
4646

4747
if(PARAM_NO_INTERNAL_DEPENDENCIES)
@@ -130,9 +130,6 @@ function(add_lldb_library name)
130130
add_dependencies(${name} clang-tablegen-targets)
131131
endif()
132132

133-
# Add in any extra C++ compilation flags for this library.
134-
target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS})
135-
136133
if(PARAM_PLUGIN)
137134
get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY)
138135
if(EXISTS ${parent_dir})

lldb/source/Plugins/Language/ObjC/CMakeLists.txt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
set(EXTRA_CXXFLAGS "")
2-
3-
if (CXX_SUPPORTS_NO_GNU_ANONYMOUS_STRUCT)
4-
set(EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS} -Wno-gnu-anonymous-struct)
5-
endif ()
6-
7-
if (CXX_SUPPORTS_NO_NESTED_ANON_TYPES)
8-
set(EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS} -Wno-nested-anon-types)
9-
endif ()
10-
111
add_lldb_library(lldbPluginObjCLanguage PLUGIN
122
ObjCLanguage.cpp
133
CF.cpp
@@ -36,6 +26,14 @@ add_lldb_library(lldbPluginObjCLanguage PLUGIN
3626
lldbPluginTypeSystemClang
3727
CLANG_LIBS
3828
clangAST
39-
40-
EXTRA_CXXFLAGS ${EXTRA_CXXFLAGS}
4129
)
30+
31+
if (CXX_SUPPORTS_NO_GNU_ANONYMOUS_STRUCT)
32+
target_compile_options(lldbPluginObjCLanguage
33+
PRIVATE -Wno-gnu-anonymous-struct)
34+
endif ()
35+
36+
if (CXX_SUPPORTS_NO_NESTED_ANON_TYPES)
37+
target_compile_options(lldbPluginObjCLanguage
38+
PRIVATE -Wno-nested-anon-types)
39+
endif ()

0 commit comments

Comments
 (0)