From 96e0c4bf4a956956483d640fc4aadf5cde43455e Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Wed, 30 Apr 2025 11:59:55 +0200 Subject: [PATCH] dependencies/python: Fix Framework Python when pkg-config is installed In this case, self.raw_link_args is None. Fixes #14534. --- mesonbuild/dependencies/python.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py index eea53848f..b028d9f63 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py @@ -333,7 +333,9 @@ class PythonPkgConfigDependency(PkgConfigDependency, _PythonDependencyBase): # Add rpath, will be de-duplicated if necessary if framework_prefix.startswith('/Applications/Xcode.app/'): self.link_args += ['-Wl,-rpath,' + framework_prefix] - self.raw_link_args += ['-Wl,-rpath,' + framework_prefix] + if self.raw_link_args is not None: + # When None, self.link_args is used + self.raw_link_args += ['-Wl,-rpath,' + framework_prefix] class PythonFrameworkDependency(ExtraFrameworkDependency, _PythonDependencyBase):