diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-30 15:28:02 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 00:14:09 +0530 |
| commit | c0166355ceef5168b2f7b3c6cbace32e8dbafbb4 (patch) | |
| tree | 5ad1f9694597e5d9536d098dbf211537a48b917c /mesonbuild/dependencies/misc.py | |
| parent | 8481971ff2459ed34e2acb4ce4bb20d1efe6d215 (diff) | |
| download | meson-c0166355ceef5168b2f7b3c6cbace32e8dbafbb4.zip meson-c0166355ceef5168b2f7b3c6cbace32e8dbafbb4.tar.gz meson-c0166355ceef5168b2f7b3c6cbace32e8dbafbb4.tar.bz2 | |
Rewrite appleframework and extraframework dependency classes
Instead of only doing a naive filesystem search, also run the linker
so that it can tell us whether the -F path specified actually contains
the framework we're looking for.
Unfortunately, `extraframework` searching is still not 100% correct in
the case when since we want to search in either /Library/Frameworks or
in /System/Library/Frameworks but not in both. The -Z flag disables
searching in those prefixes and would in theory allow this, but then
you cannot force the linker to look in those by manually adding -F
args, so that doesn't work.
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e6f52a5..4a57952 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -307,7 +307,7 @@ class Python3Dependency(ExternalDependency): # There is a python in /System/Library/Frameworks, but that's # python 2, Python 3 will always be in /Library candidates.append(functools.partial( - ExtraFrameworkDependency, 'python', False, '/Library/Frameworks', + ExtraFrameworkDependency, 'Python', False, ['/Library/Frameworks'], environment, kwargs.get('language', None), kwargs)) return candidates |