diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-22 02:11:36 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-22 02:27:01 +0530 |
| commit | 0ac965cc10094e81db87c2b921c1001e97ee6410 (patch) | |
| tree | 75ea0705fff61044067e93f7c085498af7678ea7 /mesonbuild/scripts | |
| parent | 18f581f2c47d3ba81ce753334830ac8ecd5e5a5c (diff) | |
| download | meson-0ac965cc10094e81db87c2b921c1001e97ee6410.zip meson-0ac965cc10094e81db87c2b921c1001e97ee6410.tar.gz meson-0ac965cc10094e81db87c2b921c1001e97ee6410.tar.bz2 | |
Fix shared library symlink aliasing on install
Set the rules for the symlinking on the target itself, and then reuse
that information while generating aliases during the build, and then
pass it to the install script too.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 11dd320..c749b4f 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -222,14 +222,14 @@ def install_targets(d): else: raise RuntimeError('Unknown file type for {!r}'.format(fname)) printed_symlink_error = False - for alias in aliases: + for alias, to in aliases.items(): try: symlinkfilename = os.path.join(outdir, alias) try: os.unlink(symlinkfilename) except FileNotFoundError: pass - os.symlink(os.path.split(fname)[-1], symlinkfilename) + os.symlink(to, symlinkfilename) append_to_log(symlinkfilename) except (NotImplementedError, OSError): if not printed_symlink_error: |