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 /run_tests.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 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/run_tests.py b/run_tests.py index 2805375..943e16f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -217,6 +217,7 @@ def clear_meson_configure_class_caches(): mesonbuild.compilers.CCompiler.library_dirs_cache = {} mesonbuild.compilers.CCompiler.program_dirs_cache = {} mesonbuild.compilers.CCompiler.find_library_cache = {} + mesonbuild.compilers.CCompiler.find_framework_cache = {} mesonbuild.dependencies.PkgConfigDependency.pkgbin_cache = {} mesonbuild.dependencies.PkgConfigDependency.class_pkgbin = mesonlib.PerMachine(None, None, None) |