From 8174d7c87b5a966ef3d7aa469923fc9a44f680fa Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 9 Feb 2019 01:37:48 -0800 Subject: [PATCH] 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 Maintainer: Gabe Black --- src/SConscript | 2 +- src/systemc/tests/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SConscript b/src/SConscript index 0b66d6a62..dcb08a304 100644 --- a/src/SConscript +++ b/src/SConscript @@ -472,7 +472,7 @@ class UnitTest(Executable): 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'] diff --git a/src/systemc/tests/SConscript b/src/systemc/tests/SConscript index 2d713a0d8..3b0c7c3f5 100644 --- a/src/systemc/tests/SConscript +++ b/src/systemc/tests/SConscript @@ -91,7 +91,7 @@ if env['USE_SYSTEMC']: 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( -- 2.30.2