Merge pull request #60722 from akien-mga/scons-disable-Werror-return-type

SCons: Don't enable any `-Werror=return-type` outside `werror=yes`
This commit is contained in:
Rémi Verschelde 2022-05-03 11:38:06 +02:00 committed by GitHub
commit 0a9d31a7eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -622,10 +622,6 @@ if selected_platform in platform_list:
env.Append(CCFLAGS=["-Wno-error=return-type"])
elif methods.using_clang(env) or methods.using_emcc(env):
env.Append(CXXFLAGS=["-Wno-error=#warnings"])
else: # Always enable those errors.
# False positives in our error macros, see GH-58747.
if not (methods.using_gcc(env) and cc_version_major >= 12):
env.Append(CCFLAGS=["-Werror=return-type"])
if hasattr(detect, "get_program_suffix"):
suffix = "." + detect.get_program_suffix()