From 838c0485e01f3d3403b430aa6df5b4a1f5262dc3 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Thu, 28 Feb 2019 09:53:28 +0000 Subject: [PATCH] scons: Workaround failures with MSVC when using SCons 3.0.[2-4]. This change applies the workaround suggested by Bill Deegan on the affected SCons versions. It also adds a comment with the URL explaining why we were using customizing the decider and max_drift in the first place, as I had forgotten all about it. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109443 Tested-by: liviuprodea@yahoo.com Reviewed-by: Roland Scheidegger Reviewed-by: Brian Paul --- scons/gallium.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scons/gallium.py b/scons/gallium.py index 963834a5fbc..efe32e06c6c 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -308,7 +308,13 @@ def generate(env): if env.GetOption('num_jobs') <= 1: env.SetOption('num_jobs', num_jobs()) - env.Decider('MD5-timestamp') + # Speed up dependency checking. See + # - https://github.com/SCons/scons/wiki/GoFastButton + # - https://bugs.freedesktop.org/show_bug.cgi?id=109443 + scons_version = distutils.version.StrictVersion(SCons.__version__) + if scons_version < distutils.version.StrictVersion('3.0.2') or \ + scons_version > distutils.version.StrictVersion('3.0.4'): + env.Decider('MD5-timestamp') env.SetOption('max_drift', 60) # C preprocessor options