From fcde59b24525056bea598278ee8d496182ede7fd Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 19 Dec 2022 17:09:28 +0000 Subject: [PATCH] util: ext/systemc is importing env Environment instead of main This got changed by [1] With this patch we export env instead of main. There is no risk of ext/systemc polluting the environment as its SConscript is cloning env to the systemc variable anyway, so this double copy was redundant anyway [1]: https://gem5-review.googlesource.com/c/public/gem5/+/56750 Change-Id: Ib6648e9b38416cac0bc7f06d90a337f32bdca6ca Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66854 Maintainer: Daniel Carvalho Tested-by: kokoro Reviewed-by: Daniel Carvalho --- util/tlm/SConstruct | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/tlm/SConstruct b/util/tlm/SConstruct index 1a9a79f402..7fe09d446d 100644 --- a/util/tlm/SConstruct +++ b/util/tlm/SConstruct @@ -74,15 +74,14 @@ deps += SConscript('examples/common/SConscript', # the SystemC SConscript makes certain assumptions, we need to fulfill these # assumptions before calling the SConscript. -main = env sys.path.append(gem5_root + '/src/python') AddOption('--no-colors', dest='use_colors', action='store_false', help="Don't add color to abbreviated scons output") -main.SConsignFile('build/systemc/sconsign') +env.SConsignFile('build/systemc/sconsign') SConscript(gem5_root + '/ext/systemc/SConscript', variant_dir='build/systemc', - exports='main') + exports='env') # By adding libraries as dependencies instead of using LIBS, we avoid that # the user needs to set the LD_LIBRARY_PATH