summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-09 13:07:00 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-09 13:07:00 -0500
commita0f65246bfac279130aa67851f9c4d5c27e967b1 (patch)
treea725e7f88737f75dd5dbe9423ae4cda2ef15dbb4
parentfb10300c4f23c8f9498f805ea95590e549b35fe5 (diff)
parentd3c1cc9f1512260b5434d8f735662b4d9e32af53 (diff)
downloadgem5-a0f65246bfac279130aa67851f9c4d5c27e967b1.tar.xz
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch --HG-- extra : convert_revision : 41a0e8c0b2d328bee958126f395369d4549aabfc
-rw-r--r--SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConscript b/SConscript
index 56a4e3610..589b2a17c 100644
--- a/SConscript
+++ b/SConscript
@@ -400,7 +400,7 @@ def ISAScan():
"SRCDIR",
'^[ \t]*##[ \t]*include[ \t]*"([^>"]+)"')
-def ISAPath(env, dir, a=None):
+def ISAPath(env, dir, target=None, source=None, a=None):
return (Dir(env['SRCDIR']), Dir('.'))
iscan = Scanner(function = ISAScan().scan, skeys = [".isa", ".ISA"],