Richard Cooper has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/57909 )
Change subject: util-m5: Fix Scons exports when building the m5 utility
......................................................................
util-m5: Fix Scons exports when building the m5 utility
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
---
M util/m5/SConstruct
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/util/m5/SConstruct b/util/m5/SConstruct
index 941b9fe..62be63c 100644
--- a/util/m5/SConstruct
+++ b/util/m5/SConstruct
@@ -179,7 +179,7 @@
# 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 @@
# 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')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/57909
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: I195b760e9092fbe63e5de1316403e090c1fa4e1f
Gerrit-Change-Number: 57909
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Cooper <richard.coo...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
