Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/58633 )
Change subject: scons: Monkey patch a fix from 3.0.2 into 3.0.0 and 3.0.1.
..
scons: Monkey patch a fix from 3.0.2 into 3.0.0 and 3.0.1.
Ensure that SCons.Subst.Literal can be hashed.
https: //pairlist2.pair.net/pipermail/scons-dev/2018-October/004766.html
Change-Id: I5221b63a5fd63189eb690c77e780805dc6d68125
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/58633
Maintainer: Gabe Black
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
---
M SConstruct
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index b170cf4..cf130c1 100755
--- a/SConstruct
+++ b/SConstruct
@@ -94,6 +94,14 @@
import SCons.Node.FS
import SCons.Tool
+if getattr(SCons, '__version__', None) in ('3.0.0', '3.0.1'):
+# Monkey patch a fix which appears in version 3.0.2, since we only
+# require version 3.0.0
+def __hash__(self):
+return hash(self.lstr)
+import SCons.Subst
+SCons.Subst.Literal.__hash__ = __hash__
+
#
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58633
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: I5221b63a5fd63189eb690c77e780805dc6d68125
Gerrit-Change-Number: 58633
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
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
