diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-03 11:38:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 11:38:06 +0200 |
| commit | 0a9d31a7eb9debe30cd5078688e895d2ce3f2efa (patch) | |
| tree | f2595e532ed274ac290a487ab976b6c92ce208f2 | |
| parent | 3614492dd3169242ac81a2b08e38ca1add0594b0 (diff) | |
| parent | e55d30768a83f027f2c36e106e0ad5320723709d (diff) | |
Merge pull request #60722 from akien-mga/scons-disable-Werror-return-type
SCons: Don't enable any `-Werror=return-type` outside `werror=yes`
| -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() |