From fe4fd9f4146684a649131d09bbf85ecb96ef4ba7 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 13 Jun 2008 17:34:22 -0700 Subject: [PATCH] scons: fix program_info.cc generation --- src/SConscript | 3 ++- src/python/generate.py | 2 +- 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