From d6ef5b202413e19e1389a51e5804b214e3961c09 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 21 Dec 2020 11:39:51 -0800 Subject: [PATCH] depfixer: split new rpath into multiple entries for dedup comparisons Fixes: #8115 Signed-off-by: Alan Coopersmith --- mesonbuild/scripts/depfixer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py index 18d70cca9..e31f87db2 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