Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/51627 )
Change subject: fastmodel: Don't try to "staticify" system libraries.
......................................................................
fastmodel: Don't try to "staticify" system libraries.
We want to insist that the fast model libraries are the static versions
so they don't have to be found on non-system paths at run time, but we
don't need or want to do the same for system libraries which are from
standard paths on the host system.
Split the set of libraries fast model adds to the build into ones that
come from fast model itself, and ones it needs which should be
provided by the system. The ones from fast model itself should still
go through staticify, but the system libraries should be passed to the
compiler generically so it can pick which version it wants.
Change-Id: I222c94f8117143b86377150e686a4af669a994fe
---
M src/arch/arm/fastmodel/SConscript
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/arch/arm/fastmodel/SConscript
b/src/arch/arm/fastmodel/SConscript
index c3c121e..80717fe 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -123,17 +123,20 @@
env.Append(LIBPATH=lib_paths)
env.Append(RPATH=lib_paths)
-libs = (
+fm_libs = (
'components',
'pvbus',
'armctmodel',
'fmruntime',
'IrisSupport',
+)
+env.Append(LIBS=list(staticify(env, lib) for lib in fm_libs))
+system_libs = (
'atomic',
'dl',
'rt',
)
-env.Append(LIBS=list(staticify(env, lib) for lib in libs))
+env.Append(LIBS=system_libs)
class ProjectFileParser(Grammar):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51627
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: I222c94f8117143b86377150e686a4af669a994fe
Gerrit-Change-Number: 51627
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-CC: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
