diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 21:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:14:28 +0100 |
| commit | b967c910b88ed0cf134749464dcec7f4311e19f4 (patch) | |
| tree | dcf63119d2b917452f8c2b6ce01787eeee02273a /SConstruct | |
| parent | 7d691c1812a42d8aafafc2733d59723aa622f44b (diff) | |
| parent | 49fec646cbf3afdf5e7d55589ab359a5ebcdb897 (diff) | |
Merge pull request #36327 from akien-mga/fix-warnings-reenable-werror
Fix compilation warnings and re-enable werror=yes on Travis
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 2b368f7b19..fe6178d670 100644 --- a/SConstruct +++ b/SConstruct @@ -357,7 +357,8 @@ if selected_platform in platform_list: env.Append(CCFLAGS=['-Walloc-zero', '-Wduplicated-branches', '-Wduplicated-cond', '-Wstringop-overflow=4', '-Wlogical-op']) - env.Append(CXXFLAGS=['-Wnoexcept', '-Wplacement-new=1']) + # -Wnoexcept was removed temporarily due to GH-36325. + env.Append(CXXFLAGS=['-Wplacement-new=1']) version = methods.get_compiler_version(env) if version != None and version[0] >= '9': env.Append(CCFLAGS=['-Wattribute-alias=2']) @@ -369,6 +370,11 @@ if selected_platform in platform_list: env.Append(CCFLAGS=['-w']) if (env["werror"]): env.Append(CCFLAGS=['-Werror']) + # FIXME: Temporary workaround after the Vulkan merge, remove once warnings are fixed. + if methods.using_gcc(env): + env.Append(CXXFLAGS=['-Wno-error=cpp']) + else: + env.Append(CXXFLAGS=['-Wno-error=#warnings']) else: # always enable those errors env.Append(CCFLAGS=['-Werror=return-type']) |