aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2020-12-21 11:39:51 -0800
committerNirbheek Chauhan <nirbheek@centricular.com>2021-01-06 14:53:07 +0530
commit0c53224b5ff2741a6e2d43d38145a4e6ca9563cf (patch)
tree79cfccc765aa880623aa77f214905374de2196b2
parent303bd624ea46e63c3e630cf5bba5529e24ef29ae (diff)
downloadmeson-0c53224b5ff2741a6e2d43d38145a4e6ca9563cf.zip
meson-0c53224b5ff2741a6e2d43d38145a4e6ca9563cf.tar.gz
meson-0c53224b5ff2741a6e2d43d38145a4e6ca9563cf.tar.bz2
depfixer: split new rpath into multiple entries for dedup comparisons
Fixes: #8115 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--mesonbuild/scripts/depfixer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 18d70cc..e31f87d 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -313,7 +313,7 @@ class Elf(DataSizes):
# Only add each one once.
new_rpaths = OrderedSet() # type: OrderedSet[bytes]
if new_rpath:
- new_rpaths.add(new_rpath)
+ new_rpaths.update(new_rpath.split(b':'))
if old_rpath:
# Filter out build-only rpath entries
# added by get_link_dep_subdirs() or