From 5abb19c89b68eb3b6de15189f4f6703803ae1bdc Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 28 Aug 2020 17:58:12 -0700 Subject: [PATCH] scons: Set the minimum scons version to 3.0. Change-Id: Id57a93e819588d2231d2d2d8b28cd62b05fbbe9b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33675 Reviewed-by: Steve Reinhardt Maintainer: Gabe Black Tested-by: kokoro --- site_scons/site_init.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/site_scons/site_init.py b/site_scons/site_init.py index 82e1c8a4d..28a9d0c13 100644 --- a/site_scons/site_init.py +++ b/site_scons/site_init.py @@ -43,12 +43,7 @@ from gem5_python_paths import extra_python_paths # Check for recent-enough Python and SCons versions. try: - # Really old versions of scons only take two options for the - # function, so check once without the revision and once with the - # revision, the first instance will fail for stuff other than - # 0.98, and the second will fail for 0.98.0 - EnsureSConsVersion(0, 98) - EnsureSConsVersion(0, 98, 1) + EnsureSConsVersion(3, 0, 0) except SystemExit as e: print(""" For more details, see: -- 2.30.2