From dc1b4be6be321e39d21604ab4287c9ce972be4da Mon Sep 17 00:00:00 2001 From: Piotr Brzeziński Date: Fri, 28 Jun 2024 14:06:25 +0200 Subject: linkers: Fix AppleDynamicLinker not returning any rpaths to remove Fixes regression from commit 78e9009ff9d36925e04f329f9082841002ddd848. The above commit relied on rpath_dirs_to_remove being present and correctly filled, which was never the case for the AppleDynamicLinker. The result was that all the build-dir-only RPATHs were being carried over to the installed files. This commit implements returning the list of RPATHs to remove in AppleDynamicLinker, doing pretty much the same thing as what's in the GnuLikeDynamicLinkerMixin. Thanks to that, depfixer now correctly removes build-time Meson-created RPATHs, as it used to before 1.4.1. --- unittests/baseplatformtests.py | 1 + 1 file changed, 1 insertion(+) (limited to 'unittests/baseplatformtests.py') diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index e94a2baac..6e6a01d40 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -78,6 +78,7 @@ class BasePlatformTests(TestCase): self.linuxlike_test_dir = os.path.join(src_root, 'test cases/linuxlike') self.objc_test_dir = os.path.join(src_root, 'test cases/objc') self.objcpp_test_dir = os.path.join(src_root, 'test cases/objcpp') + self.darwin_test_dir = os.path.join(src_root, 'test cases/darwin') # Misc stuff self.orig_env = os.environ.copy() -- cgit v1.2.3