diff options
| author | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
|---|---|---|
| committer | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
| commit | 4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (patch) | |
| tree | b2d8d27e41eae3d659dbe6e6665436d02bcea429 /python/SConscript | |
| parent | 16a2357e8637fed706a94ab0da6226df8a2e7f07 (diff) | |
| parent | efd0c5d4b04f630f1b591af509458224b6d98655 (diff) | |
| download | gem5-4f2480a18bdf98792e2ebf3471ce7cd3109ef824.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
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 |