From c0166355ceef5168b2f7b3c6cbace32e8dbafbb4 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 30 Jan 2019 15:28:02 +0530 Subject: 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. --- run_tests.py | 1 + 1 file changed, 1 insertion(+) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index 2805375c4..943e16f57 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) -- cgit v1.2.3