Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49403 )
Change subject: scons: Don't explicitly list include dependencies for the
cxx config.
......................................................................
scons: Don't explicitly list include dependencies for the cxx config.
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 <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Yu-hsin Wang <[email protected]>
---
M src/SConscript
1 file changed, 20 insertions(+), 13 deletions(-)
Approvals:
Yu-hsin Wang: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 76f29f3..db26415 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -701,16 +701,14 @@
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 @@
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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49403
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I295c22e52e38c53ab7705193f2fe2c98227ea70d
Gerrit-Change-Number: 49403
Gerrit-PatchSet: 22
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jui-min Lee <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
