derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Don't explicitly list include dependencies for the cxx config.

Browse Source 
SCons will scan c/c++ files for include dependencies itself, there's no
need to list them explicitly.

Change-Id: I295c22e52e38c53ab7705193f2fe2c98227ea70d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49403
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Yu-hsin Wang <yuhsingw@google.com>
This commit is contained in:
Gabe Black
2021-08-15 00:50:19 -07:00
parent 16c49af22e
commit bad6fa679d
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/SConscript
View File

@@ -701,16 +701,14 @@ if GetOption('with_cxx_config'):
env.Command(cxx_config_cc_file, Value(name),
MakeAction(createSimObjectCxxConfig(False),
Transform("CXXCPRCC")))
env.Depends(cxx_config_hh_file, depends + extra_deps +
[File('params/%s.hh' % name), File('sim/cxx_config.hh')])
env.Depends(cxx_config_cc_file, depends + extra_deps +
[cxx_config_hh_file])
env.Depends(cxx_config_hh_file, depends + extra_deps)
env.Depends(cxx_config_cc_file, depends + extra_deps)
Source(cxx_config_cc_file)
cxx_config_init_cc_file = File('cxx_config/init.cc')
def createCxxConfigInitCC(target, source, env):
assert len(target) == 1 and len(source) == 1
assert len(target) == 1
code = code_formatter()
@@ -736,15 +734,8 @@ if GetOption('with_cxx_config'):
code('} // namespace gem5')
code.write(target[0].abspath)
py_source = PySource.modules[simobj.__module__]
extra_deps = [ py_source.tnode ]
env.Command(cxx_config_init_cc_file, Value(name),
env.Command(cxx_config_init_cc_file, [],
MakeAction(createCxxConfigInitCC, Transform("CXXCINIT")))
cxx_param_hh_files = ["cxx_config/%s.hh" % simobj
for name,simobj in sorted(sim_objects.items())
if not hasattr(simobj, 'abstract') or not simobj.abstract]
Depends(cxx_config_init_cc_file, cxx_param_hh_files +
[File('sim/cxx_config.hh')])
Source(cxx_config_init_cc_file)
# Generate all enum header files