Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/16284 )
Change subject: systemc: scons: Specify RPATH as a list.
......................................................................
systemc: scons: Specify RPATH as a list.
scons will attempt to use insert() on the value of RPATH when adding in
additional values. That will fail if RPATH is a Literal.
Change-Id: I9da75c6b189f12843a3452cdf92f7b56c0ec340b
Reviewed-on: https://gem5-review.googlesource.com/c/16284
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/tests/SConscript
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
diff --git a/src/systemc/tests/SConscript b/src/systemc/tests/SConscript
index f7894aa..2d713a0 100644
--- a/src/systemc/tests/SConscript
+++ b/src/systemc/tests/SConscript
@@ -98,7 +98,8 @@
env['SHARED_LIB'][0].dir.abspath,
self.path(env).dir.abspath)
env.Append(LINKFLAGS=Split('-z origin'))
- env.Append(RPATH=env.Literal(os.path.join('\\$$ORIGIN',
relpath)))
+ env.Append(RPATH=[
+ env.Literal(os.path.join('\\$$ORIGIN', relpath))])
test_bin = super(SystemCTestBin, self).declare(env, objs)
test_dir = self.dir.Dir(self.reldir)
for dep in self.test_deps:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16284
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I9da75c6b189f12843a3452cdf92f7b56c0ec340b
Gerrit-Change-Number: 16284
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-Reviewer: Weiping Liao <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
