Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/58070 )
Change subject: arch-arm,base: Use SourceLib() in a few simple spots.
......................................................................
arch-arm,base: Use SourceLib() in a few simple spots.
There are a couple places where SourceLib(), an interface to SCons's
LIB variable that respects tags, can be used simply in existing
SConscripts. Do that so that SourceLib is used, and as an example if
someone wants to see it in action.
Change-Id: Idb27da17724990093252b710f5f9fde8351a4bc5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/58070
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/fastmodel/SConscript
M src/base/SConscript
2 files changed, 25 insertions(+), 9 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/SConscript
b/src/arch/arm/fastmodel/SConscript
index 00aec93..32faa3c 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -140,15 +140,12 @@
'fmruntime',
'IrisSupport',
)
-env.Append(LIBS=list(staticify(env, lib) for lib in fm_static_libs))
+for lib in fm_static_libs:
+ SourceLib(staticify(env, lib))
-system_libs = (
- 'atomic',
- 'dl',
- 'rt',
-)
-env.Append(LIBS=system_libs)
-
+SourceLib('atomic')
+SourceLib('dl')
+SourceLib('rt')
class ProjectFileParser(Grammar):
class Param(object):
diff --git a/src/base/SConscript b/src/base/SConscript
index 21ebde9..574a64f 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -48,7 +48,7 @@
warning("No IEEE FP rounding mode control.\n"
"FP results may deviate slightly from other platforms.")
if env['HAVE_PNG']:
- env.Append(LIBS=['png'])
+ SourceLib('png')
Source('pngwriter.cc')
Source('fiber.cc')
GTest('fiber.test', 'fiber.test.cc', 'fiber.cc')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58070
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: Idb27da17724990093252b710f5f9fde8351a4bc5
Gerrit-Change-Number: 58070
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Gabe Black <gabebl...@google.com>
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
