summaryrefslogtreecommitdiff
path: root/mesonbuild/scripts/meson_install.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-12-22 02:11:36 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-12-22 02:27:01 +0530
commit0ac965cc10094e81db87c2b921c1001e97ee6410 (patch)
tree75ea0705fff61044067e93f7c085498af7678ea7 /mesonbuild/scripts/meson_install.py
parent18f581f2c47d3ba81ce753334830ac8ecd5e5a5c (diff)
downloadmeson-0ac965cc10094e81db87c2b921c1001e97ee6410.tar.gz
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/meson_install.py')
-rw-r--r--mesonbuild/scripts/meson_install.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 11dd32094..c749b4fae 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: