diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:25:34 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:25:34 +0300 |
| commit | 9f05fce831c5987346421687cc584df7c3907db6 (patch) | |
| tree | fbf89af65c4971159044f7b680be974ae77e0e58 | |
| parent | bb36eec84639c84ac60ff1efd4208bb7638be56d (diff) | |
| download | meson-9f05fce831c5987346421687cc584df7c3907db6.zip meson-9f05fce831c5987346421687cc584df7c3907db6.tar.gz meson-9f05fce831c5987346421687cc584df7c3907db6.tar.bz2 | |
Slogging through the test suite.
| -rw-r--r-- | backends.py | 2 | ||||
| -rw-r--r-- | environment.py | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/backends.py b/backends.py index 32c2270..ec39c0c 100644 --- a/backends.py +++ b/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] diff --git a/environment.py b/environment.py index 0e67499..50c755c 100644 --- a/environment.py +++ b/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 |