summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-06-18 12:31:24 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-06-18 12:31:24 -0400
commitd21fa52c09754dc32056185b141a2faf33e3bbf6 (patch)
tree060526f97f170275d73784f4b81ee76d1c3c232e
parentdeaf940946a7381d6f77dd8732951ff5ba0d1e8c (diff)
parent7171811cad27f4b62ec30ec41e087f74a479d10e (diff)
downloadgem5-d21fa52c09754dc32056185b141a2faf33e3bbf6.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into tpx31.:C:/cygwin/home/stever/bk/newmem --HG-- extra : convert_revision : c13feaea77fe650a3d11112804a88bc5c729c32e
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 6f20d9756..0a7b6c6dc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -159,7 +159,7 @@ env = Environment(ENV = os.environ, # inherit user's environment vars
ROOT = ROOT,
SRCDIR = SRCDIR)
-env.SConsignFile("sconsign")
+env.SConsignFile(os.path.join(build_root,"sconsign"))
# Default duplicate option is to use hard links, but this messes up
# when you use emacs to edit a file in the target dir, as emacs moves