From 351c7ee8533a09a09e2bf17a3c8d2f349af06448 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 6 Nov 2018 16:01:32 -0800 Subject: [PATCH] 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 Maintainer: Jason Lowe-Power --- util/tlm/SConstruct | 2 +- util/tlm/src/SConscript | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/util/tlm/SConstruct b/util/tlm/SConstruct index 906094c7d..8df249cdb 100644 --- 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 76300df79..57c232340 100644 --- 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')] -- 2.30.2