From 68cf65e9b581b49edaf4744520ca1586dfd6682f Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Fri, 6 Jan 2023 13:53:55 +0000 Subject: [PATCH] scons: Clone env before modifying it in SharedLib Without this, modifications to env propagate to unexpected places. This mirrors behaviour in Executable (where the code was copied from). Change-Id: I35bbf2f3cc2786eb50ff751c813853971ab284fe Signed-off-by: Nicolas Boichat Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67233 Maintainer: Jason Lowe-Power Reviewed-by: Jason Lowe-Power Reviewed-by: Gabe Black Tested-by: kokoro --- src/SConscript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SConscript b/src/SConscript index 51b4bd9b3b..3179849601 100644 --- a/src/SConscript +++ b/src/SConscript @@ -376,6 +376,8 @@ class SharedLib(TopLevelBase): def declare(self, env): objs = self.srcs_to_objs(env, self.sources(env)) + env = env.Clone() + libs = self.libs(env) # Higher priority libraries should be earlier in the list. libs.sort(key=lambda l: l.priority, reverse=True)