diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-03-11 11:27:36 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-03-11 11:27:36 -0800 |
| commit | 02f10fbdc8ab95d8115fc71238f157d4e10f45a6 (patch) | |
| tree | 7e9fde33fb3e48d68a6d5d2e0c11a51f05a43167 /src | |
| parent | b6ba1a528b0dca64b5d44f7deebea48bb62abe1b (diff) | |
| download | gem5-02f10fbdc8ab95d8115fc71238f157d4e10f45a6.tar.xz | |
SCons: Stop embedding the mercurial revision into the binary.
This causes a lot of rebuilds that could have otherwise possibly been
avoided, and, more annoyingly, a lot of unnecessary rerunning of the
regressions. The benefits of having the revision in the output haven't
materialized, so this change removes it.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/SConscript | 5 | ||||
| -rw-r--r-- | src/python/m5/main.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/SConscript b/src/SConscript index 0ee144747..842044e4c 100755 --- a/src/SConscript +++ b/src/SConscript @@ -410,7 +410,7 @@ depends = [ PySource.modules[dep].snode for dep in module_depends ] # Generate Python file containing a dict specifying the current # buildEnv flags. def makeDefinesPyFile(target, source, env): - build_env, hg_info = [ x.get_contents() for x in source ] + build_env = source[0].get_contents() code = code_formatter() code(""" @@ -418,7 +418,6 @@ import m5.internal import m5.util buildEnv = m5.util.SmartDict($build_env) -hgRev = '$hg_info' compileDate = m5.internal.core.compileDate _globals = globals() @@ -430,7 +429,7 @@ del _globals """) code.write(target[0].abspath) -defines_info = [ Value(build_env), Value(env['HG_INFO']) ] +defines_info = Value(build_env) # Generate a file with all of the compile options in it env.Command('python/m5/defines.py', defines_info, MakeAction(makeDefinesPyFile, Transform("DEFINES", 0))) diff --git a/src/python/m5/main.py b/src/python/m5/main.py index 23a012166..dc8aab924 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -177,7 +177,6 @@ def main(): print 'Build information:' print print 'compiled %s' % defines.compileDate; - print "revision %s" % defines.hgRev print 'build options:' keys = defines.buildEnv.keys() keys.sort() @@ -245,7 +244,6 @@ def main(): print print "M5 compiled %s" % defines.compileDate; - print "M5 revision %s" % defines.hgRev print "M5 started %s" % datetime.datetime.now().strftime("%b %e %Y %X") print "M5 executing on %s" % socket.gethostname() |