diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
| commit | bc76a807af2a2a874be461f0c6be9a6c5ec8bfad (patch) | |
| tree | 423bd4e153fcc425dc9b7266978bd42778e55c32 /python/SConscript | |
| parent | 8b042182626b94ed6380f0ba6b99c0e862aa710f (diff) | |
| parent | 036a8ceb8da8aff10b819b4aab32584d41282a64 (diff) | |
| download | gem5-bc76a807af2a2a874be461f0c6be9a6c5ec8bfad.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : 453615c8194ae9ca96330b7493c6b19fc89c3a72
Diffstat (limited to 'python/SConscript')
| -rw-r--r-- | python/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/SConscript b/python/SConscript index 1082b52c1..57b018fea 100644 --- a/python/SConscript +++ b/python/SConscript @@ -30,7 +30,7 @@ import os, os.path, re, sys Import('env') -import m5scons +import scons_helper def WriteEmbeddedPyFile(target, source, path, name, ext, filename): if isinstance(source, str): @@ -151,7 +151,7 @@ def MakeDefinesPyFile(target, source, env): f = file(str(target[0]), 'w') print >>f, "import __main__" print >>f, "__main__.m5_build_env = ", - print >>f, m5scons.flatten_defines(env['CPPDEFINES']) + print >>f, scons_helper.flatten_defines(env['CPPDEFINES']) f.close() CFileCounter = 0 |