summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-06-13 17:34:22 -0700
committerNathan Binkert <nate@binkert.org>2008-06-13 17:34:22 -0700
commitfe4fd9f4146684a649131d09bbf85ecb96ef4ba7 (patch)
treeafc1f47f3026120618b6d098e219ed47c42fb482 /src
parentdace77dc4a9fd95650cb4fe967fe28179672d9a3 (diff)
downloadgem5-fe4fd9f4146684a649131d09bbf85ecb96ef4ba7.tar.xz
scons: fix program_info.cc generation
Diffstat (limited to 'src')
-rw-r--r--src/SConscript3
-rw-r--r--src/python/generate.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript
index e360611a0..b9c83af9e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -334,7 +334,8 @@ Source('base/traceflags.cc')
# Generate program_info.cc
env.Command('base/program_info.cc',
- Value(str(SCons.Node.FS.default_fs.SConstruct_dir)), generate.programInfo)
+ Value(str(SCons.Node.FS.default_fs.SConstruct_dir)),
+ generate.programInfo)
# Build the zip file
py_compiled = []
diff --git a/src/python/generate.py b/src/python/generate.py
index f4d923870..c32204bc9 100644
--- a/src/python/generate.py
+++ b/src/python/generate.py
@@ -535,7 +535,7 @@ extern const Flags *compoundFlags[];
pi_stats.close()
target = str(target[0])
- scons_dir = eval(str(source[0]))
+ scons_dir = str(source[0])
try:
import mercurial.demandimport, mercurial.hg, mercurial.ui
import mercurial.util, mercurial.node