diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-17 18:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 18:36:16 +0200 |
| commit | 21894e42a18ac8a9f8a374f03c22426e64f81f92 (patch) | |
| tree | 56a5bf37f12579a44f9619b6e138f4eba68dcd3f | |
| parent | 17304f1aaed434b0547606ff22721d65292d8cf1 (diff) | |
| parent | 26ab805c78aa6ca2c398ebee1c556f7749310c8b (diff) | |
Merge pull request #37958 from akien-mga/scons-no-werror-on-stable
SCons: Disable -Werror on 'stable' releases
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 8fc333a8fa..e866a4c998 100644 --- a/SConstruct +++ b/SConstruct @@ -12,6 +12,7 @@ import sys # Local import methods import gles_builders +import version from platform_methods import run_in_subprocess # Scan possible build platforms @@ -72,6 +73,7 @@ env_base.disabled_modules = [] env_base.use_ptrcall = False env_base.module_version_string = "" env_base.msvc = False +env_base.stable_release = version.status == "stable" env_base.__class__.disable_module = methods.disable_module @@ -126,7 +128,7 @@ opts.Add(BoolVariable("xaudio2", "Enable the XAudio2 audio driver", False)) opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False)) opts.Add(BoolVariable("progress", "Show a progress indicator during compilation", True)) opts.Add(EnumVariable("warnings", "Level of compilation warnings", "all", ("extra", "all", "moderate", "no"))) -opts.Add(BoolVariable("werror", "Treat compiler warnings as errors", True)) +opts.Add(BoolVariable("werror", "Treat compiler warnings as errors", not env_base.stable_release)) opts.Add(BoolVariable("dev", "If yes, alias for verbose=yes warnings=extra werror=yes", False)) opts.Add("extra_suffix", "Custom extra suffix added to the base filename of all generated binary files", "") opts.Add(BoolVariable("vsproj", "Generate a Visual Studio solution", False)) |