diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-09-27 16:48:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 16:48:09 +0200 |
commit | 4cf5bb027678717263476e676cd23f881eef1ca1 (patch) | |
tree | a842d54e82a4998c8b593f86fef858560c10b4d2 /SConstruct | |
parent | cb5a62903f9798da8b12f625cbd5a493f14e41d3 (diff) | |
parent | cdc411fd54fbafc414b29abb1d50a0ff327f0d89 (diff) |
Merge pull request #22446 from akien-mga/fix-warnings
Fix various warnings raised by GCC 5
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 1c55e0be93..17518706aa 100644 --- a/SConstruct +++ b/SConstruct @@ -333,12 +333,13 @@ if selected_platform in platform_list: # Set exception handling model to avoid warnings caused by Windows system headers. env.Append(CCFLAGS=['/EHsc']) else: # Rest of the world + disable_nonessential_warnings = ['-Wno-sign-compare'] if (env["warnings"] == 'extra'): env.Append(CCFLAGS=['-Wall', '-Wextra']) elif (env["warnings"] == 'all' or env["warnings"] == 'yes'): - env.Append(CCFLAGS=['-Wall']) + env.Append(CCFLAGS=['-Wall'] + disable_nonessential_warnings) elif (env["warnings"] == 'moderate'): - env.Append(CCFLAGS=['-Wall', '-Wno-unused']) + env.Append(CCFLAGS=['-Wall', '-Wno-unused'] + disable_nonessential_warnings) else: # 'no' env.Append(CCFLAGS=['-w']) env.Append(CCFLAGS=['-Werror=return-type']) |