derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-m5: Fix Scons exports when building the m5 utility

Browse Source 
The name of the imported environment in ext/googletest/SConscript was
changed from `main` to `env` in [1].

Updated the `exports` when building the `m5` utility to export the
correct name.

[1] https://gem5-review.googlesource.com/c/public/gem5/+/56750

Change-Id: I195b760e9092fbe63e5de1316403e090c1fa4e1f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/57909
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Richard Cooper
2022-03-17 19:28:42 +00:00
parent c11dc40f06
commit a9bf1a2d08
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/m5/SConstruct
View File

@@ -179,7 +179,7 @@ native_dir = build_dir.Dir('native')
# Bring in the googletest sources.
native.SConscript(googletest_dir.File('SConscript'),
variant_dir=native_dir.Dir('googletest'), exports={ 'main': native })
variant_dir=native_dir.Dir('googletest'), exports={ 'env': native })
native.SConscript(src_dir.File('SConscript.native'),
variant_dir=native_dir, exports={ 'env': native })
@@ -268,6 +268,6 @@ for root, dirs, files in os.walk(abspath(src_dir)):
# Bring in the googletest sources.
env.SConscript(googletest_dir.File('SConscript'),
variant_dir=abi_dir.Dir('googletest'),
exports={ 'main': env })
exports='env')
env.SConscript(src_dir.File('SConscript'),
variant_dir=abi_dir, exports='env')