From da6e8b000353d6dc7ed4bd9400556d872ee179ce Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 9 Feb 2019 01:35:28 -0800 Subject: [PATCH] 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 Maintainer: Gabe Black --- src/systemc/tests/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/systemc/tests/SConscript b/src/systemc/tests/SConscript index f7894aa34..2d713a0d8 100644 --- a/src/systemc/tests/SConscript +++ b/src/systemc/tests/SConscript @@ -98,7 +98,8 @@ if env['USE_SYSTEMC']: 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: -- 2.30.2