summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-05-30 06:34:26 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-05-30 06:34:26 -0400
commitd308055afc1ace1f321b76e8a85a9a45165da2ce (patch)
tree0a9e67961ba615023ecd2c4fbacb999b0b2e81a8
parente60dc5195ce36bc055e9ea6899df9968bccafe9f (diff)
downloadgem5-d308055afc1ace1f321b76e8a85a9a45165da2ce.tar.xz
Fix SCons version check.
SConstruct: Handle SCons version check error when running on SCons 0.96 and previous. --HG-- extra : convert_revision : 37595a468a9b56336c3f88a1057706f89bee9157
-rw-r--r--SConstruct12
1 files changed, 11 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 3fac9eb2e..cbbcb07a6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -64,7 +64,17 @@ import os
# Check for recent-enough Python and SCons versions
EnsurePythonVersion(2,3)
-EnsureSConsVersion(0,96,91)
+
+# Ironically, SCons 0.96 dies if you give EnsureSconsVersion a
+# 3-element version number.
+min_scons_version = (0,96,91)
+try:
+ EnsureSConsVersion(*min_scons_version)
+except:
+ print "Error checking current SCons version."
+ print "SCons", ".".join(map(str,min_scons_version)), "or greater required."
+ Exit(2)
+
# The absolute path to the current directory (where this file lives).
ROOT = Dir('.').abspath