Giacomo Travaglini has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/66854?usp=email )
Change subject: util: ext/systemc is importing env Environment instead of
main
......................................................................
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 <giacomo.travagl...@arm.com>
---
M util/tlm/SConstruct
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/util/tlm/SConstruct b/util/tlm/SConstruct
index 1a9a79f..7fe09d4 100644
--- a/util/tlm/SConstruct
+++ b/util/tlm/SConstruct
@@ -74,15 +74,14 @@
# 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
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66854?usp=email
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: Ib6648e9b38416cac0bc7f06d90a337f32bdca6ca
Gerrit-Change-Number: 66854
Gerrit-PatchSet: 1
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
