Merge pull request #104841 from akien-mga/scons-gcc--Wvirtual-inheritance

SCons: Only set GCC `-Wvirtual-inheritance` for C++ and `warnings=extra`
This commit is contained in:
Thaddeus Crews 2025-04-01 08:01:31 -05:00
commit f7f2e79b64
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC

View File

@ -862,12 +862,7 @@ else: # GCC, Clang
common_warnings = []
if methods.using_gcc(env):
common_warnings += [
"-Wshadow",
"-Wno-misleading-indentation",
# For optimized Object::cast_to / object.inherits_from()
"-Wvirtual-inheritance",
]
common_warnings += ["-Wshadow", "-Wno-misleading-indentation"]
if cc_version_major < 11:
# Regression in GCC 9/10, spams so much in our variadic templates
# that we need to outright disable it.
@ -895,7 +890,7 @@ else: # GCC, Clang
"-Wstringop-overflow=4",
]
)
env.Append(CXXFLAGS=["-Wplacement-new=1"])
env.Append(CXXFLAGS=["-Wplacement-new=1", "-Wvirtual-inheritance"])
# Need to fix a warning with AudioServer lambdas before enabling.
# if cc_version_major != 9: # GCC 9 had a regression (GH-36325).
# env.Append(CXXFLAGS=["-Wnoexcept"])