Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/13955
Change subject: systemc: Fix some paths in the tlm SCons(script|struct).
......................................................................
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
---
M util/tlm/SConstruct
M util/tlm/src/SConscript
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/util/tlm/SConstruct b/util/tlm/SConstruct
index 906094c..8df249c 100644
--- a/util/tlm/SConstruct
+++ b/util/tlm/SConstruct
@@ -51,7 +51,7 @@
# 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 76300df..57c2323 100644
--- a/util/tlm/src/SConscript
+++ b/util/tlm/src/SConscript
@@ -38,11 +38,13 @@
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')]
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13955
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ib457d9bdafb2bba5058e6ecf99b9d33b3072c5b3
Gerrit-Change-Number: 13955
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
