From 57ba3fccb7e2946071dedd0e22d75c106230ba09 Mon Sep 17 00:00:00 2001 From: Yu-Cheng Chang Date: Thu, 30 Nov 2023 05:56:23 +0800 Subject: [PATCH] scons: Move CPPPATH systemc_home to "src/systemc" folder (#617) Files under src/systemc require the include path of systemc_home Change-Id: Ibcbac2762259a0b997ac444b2c63a218c27af9ee --- src/arch/arm/fastmodel/SConscript | 6 ------ src/systemc/SConscript | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/arch/arm/fastmodel/SConscript b/src/arch/arm/fastmodel/SConscript index 8b1ab6af05..16b2b02e3f 100644 --- a/src/arch/arm/fastmodel/SConscript +++ b/src/arch/arm/fastmodel/SConscript @@ -50,10 +50,6 @@ import os.path if env['CONF']['USE_ARM_FASTMODEL']: env.TagImplies('arm fastmodel', 'arm isa') - -systemc_home = Dir('#/src/systemc/ext/systemc_home') -env['ENV']['SYSTEMC_HOME'] = systemc_home.abspath - def extract_var(name): val = env['CONF'].get(name, None) if val is None: @@ -114,8 +110,6 @@ cpppaths = ( pvlib_home.Dir('include/fmruntime/eslapi'), pvlib_home.Dir('Iris/include'), - systemc_home.Dir('include'), - maxcore_home.Dir('AMBA-PV/include'), ) env.Append(CPPPATH=cpppaths) diff --git a/src/systemc/SConscript b/src/systemc/SConscript index 06bdb50456..4b9892a2f0 100644 --- a/src/systemc/SConscript +++ b/src/systemc/SConscript @@ -30,6 +30,9 @@ if not env['CONF']['USE_SYSTEMC']: env.UseSystemcCheck(warn=True) -env.Append(CPPPATH=Dir('ext')) +systemc_home = Dir('#/src/systemc/ext/systemc_home') +env['ENV']['SYSTEMC_HOME'] = systemc_home.abspath + +env.Append(CPPPATH=[systemc_home.Dir('include'),Dir('ext')]) SimObject('Tlm.py', sim_objects=[])