diff options
| author | Daniele Nicolodi <daniele@grinta.net> | 2025-04-30 11:59:55 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-05-06 21:22:40 +0300 |
| commit | 96e0c4bf4a956956483d640fc4aadf5cde43455e (patch) | |
| tree | d9471895771d5da118c02b03fc6022a93ae2f296 | |
| parent | a343b01d1b3d5ba159becebf11974f4ee7189323 (diff) | |
| download | meson-96e0c4bf4a956956483d640fc4aadf5cde43455e.tar.gz | |
dependencies/python: Fix Framework Python when pkg-config is installed
In this case, self.raw_link_args is None.
Fixes #14534.
| -rw-r--r-- | mesonbuild/dependencies/python.py | 4 |
1 files changed, 3 insertions, 1 deletions
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): |