diff options
author | Steve Reinhardt <stever@gmail.com> | 2008-06-13 01:59:10 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@gmail.com> | 2008-06-13 01:59:10 -0400 |
commit | dace77dc4a9fd95650cb4fe967fe28179672d9a3 (patch) | |
tree | 76b4b2ac37d5e41d9a959e7839b9d5ed85952308 /src/SConscript | |
parent | caccbd1edcacc82a952429950fcd4314b86b5b89 (diff) | |
parent | 7e6728450fb7bb430f3fb96143cf3bc634407213 (diff) | |
download | gem5-dace77dc4a9fd95650cb4fe967fe28179672d9a3.tar.xz |
Automated merge with ssh://m5sim.org//repo/m5
Diffstat (limited to 'src/SConscript')
-rw-r--r-- | src/SConscript | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript index 69c5b946d..e360611a0 100644 --- a/src/SConscript +++ b/src/SConscript @@ -332,6 +332,10 @@ env.Command('base/traceflags.hh', flags, generate.traceFlagsHH) env.Command('base/traceflags.cc', flags, generate.traceFlagsCC) 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) + # Build the zip file py_compiled = [] py_zip_depends = [] @@ -364,11 +368,19 @@ envList = [] # date.cc. def make_objs(sources, env): objs = [env.Object(s) for s in sources] + # make date.cc depend on all other objects so it always gets # recompiled whenever anything else does date_obj = env.Object('base/date.cc') + + # Make the generation of program_info.cc dependend on all + # the other cc files and the compiling of program_info.cc + # dependent on all the objects but program_info.o + pinfo_obj = env.Object('base/program_info.cc') + env.Depends('base/program_info.cc', sources) env.Depends(date_obj, objs) - objs.append(date_obj) + env.Depends(pinfo_obj, objs) + objs.extend([date_obj,pinfo_obj]) return objs # Function to create a new build environment as clone of current |