Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48373 )
Change subject: scons: Tidy up the definition of SourceFile slightly.
......................................................................
scons: Tidy up the definition of SourceFile slightly.
Use {} notation for creating a set, and rely on the fact that applying
File() to something that already is does nothing.
Change-Id: I2ec99e4a4859df9a0a88bcc38e93233841124de6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48373
Tested-by: kokoro <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/SConscript
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 3e9f7c6..5afbb36 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -230,23 +230,21 @@
if tags is None:
tags='gem5 lib'
if isinstance(tags, str):
- tags = set([tags])
+ tags = { tags }
if not isinstance(tags, set):
tags = set(tags)
self.tags = tags
if add_tags:
if isinstance(add_tags, str):
- add_tags = set([add_tags])
+ add_tags = { add_tags }
if not isinstance(add_tags, set):
add_tags = set(add_tags)
self.tags |= add_tags
self.append = append
- tnode = source
- if not isinstance(source, SCons.Node.FS.File):
- tnode = File(source)
+ tnode = File(source)
self.tnode = tnode
self.filename = str(self.tnode)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48373
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: I2ec99e4a4859df9a0a88bcc38e93233841124de6
Gerrit-Change-Number: 48373
Gerrit-PatchSet: 12
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[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
