diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:04:26 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-10-04 23:04:26 +0300 |
| commit | 3673791b4f7d8fbc290629b1173fff91d7aee781 (patch) | |
| tree | 369732a900d2a15e8e0e3de8506b3fbfb7dc6a6c /backends.py | |
| parent | 2e656bce021e22113014470d2ef04ae46ff938c9 (diff) | |
| download | meson-3673791b4f7d8fbc290629b1173fff91d7aee781.zip meson-3673791b4f7d8fbc290629b1173fff91d7aee781.tar.gz meson-3673791b4f7d8fbc290629b1173fff91d7aee781.tar.bz2 | |
Rpaths start working.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/backends.py b/backends.py index b471d51..32c2270 100644 --- a/backends.py +++ b/backends.py @@ -225,7 +225,6 @@ class Backend(): if compiler.id == 'msvc': if fname.endswith('dll'): fname = fname[:-3] + 'lib' - fname = os.path.join('.', fname) # Hack to make ldd find the library. args.append(fname) return args @@ -852,6 +851,7 @@ class NinjaBackend(Backend): elif isinstance(target, build.SharedLibrary): commands += linker.get_std_shared_lib_link_flags() commands += linker.get_pic_flags() + commands += linker.get_soname_flags(target.name) elif isinstance(target, build.StaticLibrary): commands += linker.get_std_link_flags() else: @@ -860,6 +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())) if self.environment.coredata.coverage: commands += linker.get_coverage_link_flags() dep_targets = [self.get_dependency_filename(t) for t in dependencies] |