godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

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

Browse Source 
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
parent 3614492dd3 e55d30768a
commit 0a9d31a7eb
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -622,10 +622,6 @@ if selected_platform in platform_list:
env.Append(CCFLAGS=["-Wno-error=return-type"]) env.Append(CCFLAGS=["-Wno-error=return-type"])
elif methods.using_clang(env) or methods.using_emcc(env): elif methods.using_clang(env) or methods.using_emcc(env):
env.Append(CXXFLAGS=["-Wno-error=#warnings"]) 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"): if hasattr(detect, "get_program_suffix"):
suffix = "." + detect.get_program_suffix() suffix = "." + detect.get_program_suffix()