systemc: Fix some paths in the tlm SCons(script|struct).

The code in util/systemc was moved into a subdirectory recently. The
scons support here referred to it, and needed to be updated.

Change-Id: Ib457d9bdafb2bba5058e6ecf99b9d33b3072c5b3
Reviewed-on: https://gem5-review.googlesource.com/c/13955
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

diff --git a/util/tlm/SConstruct b/util/tlm/SConstruct
index 906094c7d07e8424036598783822e0f287ce8fa3..8df249cdbb2204dcefb5100b9238d4f86fb31318 100644 (file)
--- a/util/tlm/SConstruct
+++ b/util/tlm/SConstruct
@@ -51,7 +51,7 @@ shlibsuffix = env['SHLIBSUFFIX']
 
 # add include dirs
 env.Append(CPPPATH=[gem5_root + '/build/' + gem5_arch,
-                    gem5_root + '/util/systemc',
+                    gem5_root + '/util/systemc/gem5_within_systemc',
                     gem5_root + '/ext/systemc/src',
                     '#src',
                     '#examples/common',

diff --git a/util/tlm/src/SConscript b/util/tlm/src/SConscript
index 76300df794ce1b72af237e9d3f4bcd7067d8caf7..57c23234039b013b0cb041a32a4c0b5151c42ae0 100644 (file)
--- a/util/tlm/src/SConscript
+++ b/util/tlm/src/SConscript
@@ -38,11 +38,13 @@ env = env.Clone()
 
 gem5_root = env['GEM5_ROOT']
 
+systemc_util_dir = gem5_root + '/util/systemc/gem5_within_systemc'
+
 systemc_src = []
-systemc_src += Install('.', gem5_root + '/util/systemc/sc_gem5_control.cc'),
-systemc_src += Install('.', gem5_root + '/util/systemc/sc_logger.cc'),
-systemc_src += Install('.', gem5_root + '/util/systemc/sc_module.cc'),
-systemc_src += Install('.', gem5_root + '/util/systemc/stats.cc'),
+systemc_src += Install('.', systemc_util_dir + '/sc_gem5_control.cc'),
+systemc_src += Install('.', systemc_util_dir + '/sc_logger.cc'),
+systemc_src += Install('.', systemc_util_dir + '/sc_module.cc'),
+systemc_src += Install('.', systemc_util_dir + '/stats.cc'),
 
 tlm_src = []
 tlm_src += [File('master_transactor.cc')]