[gem5-dev] Change in gem5/gem5[develop]: scons: Don't explicitly list include dependencies for the cxx config.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
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
---
M src/SConscript
1 file changed, 4 insertions(+), 13 deletions(-)



diff --git a/src/SConscript b/src/SConscript
index c10b3c4..521eaa2 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -699,16 +699,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()

@@ -734,15 +732,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: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s