diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-02-01 11:17:03 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 07:32:05 +0000 |
| commit | a49fb66728ba435c989561416eebd7d959c6bcdc (patch) | |
| tree | 359e6d89f2059d5f29b73deb4411846c77e29878 | |
| parent | 28f2677ea6beb7b90e16d4c51233540b60281320 (diff) | |
| download | meson-a49fb66728ba435c989561416eebd7d959c6bcdc.zip meson-a49fb66728ba435c989561416eebd7d959c6bcdc.tar.gz meson-a49fb66728ba435c989561416eebd7d959c6bcdc.tar.bz2 | |
deps: Don't reject cross usage of extra frameworks
This is a regression from previous releases and breaks existing build
files, such as GStreamer. The proper fix is in master (#4857), but we
cannot backport that since it is a complete rewrite of the framework
detection.
| -rw-r--r-- | mesonbuild/dependencies/base.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index cd02939..ab3f155 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1934,11 +1934,6 @@ class ExtraFrameworkDependency(ExternalDependency): self.link_args = ['-F' + self.path, '-framework', self.name.split('.')[0]] def detect(self, name, path): - # should use the compiler to look for frameworks, rather than peering at - # the filesystem, so we can also find them when cross-compiling - if self.want_cross: - return - lname = name.lower() if path is None: paths = ['/System/Library/Frameworks', '/Library/Frameworks'] |