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.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66854 Maintainer: Daniel Carvalho <odanrc@yahoo.com.br> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user