Slogging through the test suite.

backends.py

@@ -860,7 +860,7 @@ class NinjaBackend(Backend):
             commands += dep.get_link_flags()
         dependencies = target.get_dependencies()
         commands += self.build_target_link_arguments(linker, dependencies)
-        commands.append(linker.build_rpath_arg(self.environment.get_build_dir(), target.get_rpaths()))
+        commands += linker.build_rpath_arg(self.environment.get_build_dir(), target.get_rpaths())
         if self.environment.coredata.coverage:
             commands += linker.get_coverage_link_flags()
         dep_targets = [self.get_dependency_filename(t) for t in dependencies]

environment.py

@@ -63,7 +63,7 @@ class CCompiler():
         return (None, fname)
 
     def build_rpath_arg(self, build_dir, rpath_paths):
-        return ''
+        return []
 
     def get_id(self):
         return self.id
@@ -515,8 +515,8 @@ class GnuCCompiler(CCompiler):
     def split_shlib_to_parts(self, fname):
         return (os.path.split(fname)[0], fname)
 
-    def build_rpath_arg(self, build_dir, rpath_paths):
-        return '-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])
+    def build_rpath_args(self, build_dir, rpath_paths):
+        return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
 
     def get_soname_flags(self, shlib_name):
         return ['-Wl,-soname,lib%s.so' % shlib_name]
@@ -636,7 +636,10 @@ class ArLinker():
 
     def __init__(self, exelist):
         self.exelist = exelist
-        
+
+    def build_rpath_arg(self, build_dir, rpath_paths):
+        return []
+
     def get_exelist(self):
         return self.exelist