File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,8 +44,6 @@ include(limit_jobs)
4444# Configure Seastar compile options to align with Scylla
4545if (DEFINED ENV{NIX_CC})
4646 add_compile_options (-DFMT_CONSTEVAL= )
47- add_compile_options (-Wno-deprecated-literal-operator )
48- add_compile_options (-Wno-unused-private-field )
4947endif ()
5048set (CMAKE_CXX_STANDARD "23" CACHE INTERNAL "" )
5149set (CMAKE_CXX_EXTENSIONS ON CACHE INTERNAL "" )
Original file line number Diff line number Diff line change @@ -4,8 +4,10 @@ set(disabled_warnings
44 mismatched-tags
55 missing-field-initializers
66 overloaded-virtual
7+ deprecated-literal-operator
78 unsupported-friend
89 enum-constexpr-conversion
10+ unused-private-field
911 unused-parameter)
1012include (CheckCXXCompilerFlag )
1113foreach (warning ${disabled_warnings} )
Original file line number Diff line number Diff line change @@ -1548,6 +1548,8 @@ def get_warning_options(cxx):
15481548 '-Wno-unsupported-friend' ,
15491549 '-Wno-missing-field-initializers' ,
15501550 '-Wno-deprecated-copy' ,
1551+ '-Wno-deprecated-literal-operator' ,
1552+ '-Wno-unused-private-field' ,
15511553 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
15521554 '-Wno-psabi' ,
15531555 '-Wno-enum-constexpr-conversion' ,
@@ -1676,7 +1678,7 @@ def dynamic_linker_option():
16761678 user_cflags += ' -march=' + args .target
16771679
16781680if os .environ .get ('NIX_CC' ):
1679- user_cflags += ' -DFMT_CONSTEVAL= -Wno-deprecated-literal-operator -Wno-unused-private-field '
1681+ user_cflags += ' -DFMT_CONSTEVAL='
16801682
16811683user_cflags = user_cflags .strip ()
16821684
You can’t perform that action at this time.
0 commit comments