summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-10-22 02:11:59 -0400
committerNathan Binkert <binkertn@umich.edu>2004-10-22 02:11:59 -0400
commite9acc88e360d56d28c9e4d3975e1053798a9c774 (patch)
treea1c002d0b46a2510956d33dc6daf5a21a3e9cee3
parentb881408ed76a0ad9bd6a3992230b89dcec3a25bd (diff)
parent021b1a0ef93e9dde835854a398a83e9a814e2b6e (diff)
downloadgem5-e9acc88e360d56d28c9e4d3975e1053798a9c774.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current --HG-- extra : convert_revision : 92785367bd1ae71505c5ac0491ed8e18b21ad577
-rw-r--r--build/SConstruct2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/SConstruct b/build/SConstruct
index 6a629c064..6b71fa585 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -239,6 +239,8 @@ default_env = Environment(ENV = os.environ, # inherit user's enviroment vars
FULL_SYSTEM = False,
USE_MYSQL = False)
+default_env.SConsignFile("sconsign")
+
# For some reason, the CC and CXX variables don't get passed into the
# environment correctly. This is probably some sort of scons bug that
# will eventually be fixed.