diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2022-05-03 11:28:51 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-05-03 11:30:24 +0200 |
commit | e55d30768a83f027f2c36e106e0ad5320723709d (patch) | |
tree | 57524bf87180c9fe2cee2b345acbe02e2fa5aa0c /SConstruct | |
parent | bf8da106511f2ceac194c7fdc891f7d3b7cd7e5f (diff) |
SCons: Don't enable any `-Werror=return-type` outside `werror=yes`
We shouldn't presume that future compilers will not have false positives or
find new occurrences of this warning, which would break compiling old versions
of the engine without passing custom `CXXFLAGS`.
Follow-up to #60652.
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 1c9ef7d820..01f1ae638e 100644 --- a/SConstruct +++ b/SConstruct @@ -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() |