From: Gabe Black <gabeblack@google.com>
Date: Sat, 29 Aug 2020 00:58:12 +0000 (-0700)
Subject: scons: Set the minimum scons version to 3.0.
X-Git-Tag: v20.1.0.0~196
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5abb19c89b68eb3b6de15189f4f6703803ae1bdc;p=gem5.git

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 <stever@gmail.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

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: