commit 8174d7c87b5a966ef3d7aa469923fc9a44f680fa
author Gabe Black <gabeblack@google.com> Sat Feb 09 01:37:48 2019 -0800
committer Gabe Black <gabeblack@google.com> Mon Feb 11 07:33:50 2019 +0000
tree 58c5e0f601c3cc4eecff3aad292f2b666037b1c8
parent da6e8b000353d6dc7ed4bd9400556d872ee179ce

scons: Change an = to a += when accumulating sources from filters.

The loop accidentally used a = when it should have used a +=, meaning
only the sources from the final filter would be used.

Change-Id: Ie066a5f85696f05d9ad3cf61f928b12deb39475b
Reviewed-on: https://gem5-review.googlesource.com/c/16285
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>

src/SConscript

diff --git a/src/SConscript b/src/SConscript
index 0b66d6a..dcb08a3 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -472,7 +472,7 @@
     def declare(self, env):
         sources = list(self.sources)
         for f in self.filters:
-            sources = Source.all.apply_filter(f)
+            sources += Source.all.apply_filter(f)
         objs = self.srcs_to_objs(env, sources) + env['STATIC_OBJS']
         if self.main:
             objs += env['MAIN_OBJS']

src/systemc/tests/SConscript

diff --git a/src/systemc/tests/SConscript b/src/systemc/tests/SConscript
index 2d713a0..3b0c7c3 100644
--- a/src/systemc/tests/SConscript
+++ b/src/systemc/tests/SConscript
@@ -91,7 +91,7 @@
             env = env.Clone()
             sources = list(self.sources)
             for f in self.filters:
-                sources = Source.all.apply_filter(f)
+                sources += Source.all.apply_filter(f)
             objs = self.srcs_to_objs(env, sources)
             objs = objs + env['MAIN_OBJS']
             relpath = os.path.relpath(