systemc: scons: Specify RPATH as a list.
authorGabe Black <gabeblack@google.com>
Sat, 9 Feb 2019 09:35:28 +0000 (01:35 -0800)
committerGabe Black <gabeblack@google.com>
Mon, 11 Feb 2019 07:33:27 +0000 (07:33 +0000)
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 <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>

src/systemc/tests/SConscript

index f7894aa3420b92d07683463e01b1b7e09d2cdd3d..2d713a0d8a3159ff8d363ba5e09e58c195040dca 100644 (file)
@@ -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: