Merge pull request #1927 from centricular/gir-rpath-link

Work around GNU ld bug with -rpath,$ORIGIN

2 files changed, 9 insertions, 9 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 05d6e03..1dd128b 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -294,6 +294,15 @@ class Backend:
             raise MesonException(m.format(target.name))
         return l
 
+    def determine_rpath_dirs(self, target):
+        link_deps = target.get_all_link_deps()
+        result = []
+        for ld in link_deps:
+            prospective = self.get_target_dir(ld)
+            if prospective not in result:
+                result.append(prospective)
+        return result
+
     def object_filename_from_source(self, target, source, is_unity):
         if isinstance(source, mesonlib.File):
             source = source.fname
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 40a05bf..8a2ee9a 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2334,15 +2334,6 @@ rule FORTRAN_DEP_HACK
         elem.add_item('LINK_ARGS', commands)
         return elem
 
-    def determine_rpath_dirs(self, target):
-        link_deps = target.get_all_link_deps()
-        result = []
-        for ld in link_deps:
-            prospective = self.get_target_dir(ld)
-            if prospective not in result:
-                result.append(prospective)
-        return result
-
     def get_dependency_filename(self, t):
         if isinstance(t, build.SharedLibrary):
             return os.path.join(self.get_target_private_dir(t), self.get_target_filename(t) + '.symbols')