diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-03-11 18:32:36 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-03-11 18:32:36 -0500 |
| commit | e6902a907e333c09d64d520f4c978edf7e098f6a (patch) | |
| tree | 5b0acd0444285290365fbead19f081b8f3ebdd9a /SConscript | |
| parent | b1f41a7aa0f617014d2bf6d5d3675830ffac213c (diff) | |
| parent | fa1650a08e56b176c2b31cd5c3b8939820e93884 (diff) | |
| download | gem5-e6902a907e333c09d64d520f4c978edf7e098f6a.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision : abc24d21097770ad323a2c0d537d3e9424db0d7d
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SConscript b/SConscript index 19f84f913..cff240a69 100644 --- a/SConscript +++ b/SConscript @@ -183,6 +183,9 @@ base_sources = Split(''' mem/trace/mem_trace_writer.cc mem/trace/m5_writer.cc + python/pyconfig.cc + python/embedded_py.cc + sim/builder.cc sim/configfile.cc sim/debug.cc @@ -199,8 +202,6 @@ base_sources = Split(''' sim/stat_control.cc sim/trace_context.cc sim/universe.cc - sim/pyconfig/pyconfig.cc - sim/pyconfig/embedded_py.cc ''') # MySql sources @@ -376,7 +377,7 @@ env.Command(Split('''arch/alpha/decoder.cc # SConscript-local is the per-config build, which just copies some # header files into a place where they can be found. SConscript('libelf/SConscript-local', exports = 'env', duplicate=0) -SConscript('sim/pyconfig/SConscript', exports = ['env'], duplicate=0) +SConscript('python/SConscript', exports = ['env'], duplicate=0) # This function adds the specified sources to the given build |