Eric Ye has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52304 )
Change subject: scons: Don't fail builds if TERM is not set
......................................................................
scons: Don't fail builds if TERM is not set
Bug: 204817626
Test: Scons build
Change-Id: I154c69503eaededda353d6b2925553b6cecb07eb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52304
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/m5/SConstruct
1 file changed, 18 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/m5/SConstruct b/util/m5/SConstruct
index e36cb73..941b9fe 100644
--- a/util/m5/SConstruct
+++ b/util/m5/SConstruct
@@ -94,7 +94,8 @@
# Propogate the environment's PATH setting.
main['ENV']['PATH'] = os.environ['PATH']
# Pass through terminal information to, for instance, enable color output.
-main['ENV']['TERM'] = os.environ['TERM']
+if 'TERM' in os.environ:
+ main['ENV']['TERM'] = os.environ['TERM']
# Pass through the java CLASSPATH (if it exists) so we can find libraries.
main['ENV']['CLASSPATH'] = os.environ.get('CLASSPATH', '')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52304
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: I154c69503eaededda353d6b2925553b6cecb07eb
Gerrit-Change-Number: 52304
Gerrit-PatchSet: 3
Gerrit-Owner: Eric Ye <[email protected]>
Gerrit-Reviewer: Eric Ye <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
