diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-28 23:47:15 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-02 21:37:57 +0300 |
commit | 7ac03f62646d40b31b9c1ef1b4f6778c788ec90a (patch) | |
tree | ac7220623ed8e98efb16ca94cd01cacaf7b1f715 /mesonbuild/dependencies/platform.py | |
parent | 4c2617a9c6fd02e3f8831b7de8755380ac4bcb16 (diff) | |
download | meson-7ac03f62646d40b31b9c1ef1b4f6778c788ec90a.zip meson-7ac03f62646d40b31b9c1ef1b4f6778c788ec90a.tar.gz meson-7ac03f62646d40b31b9c1ef1b4f6778c788ec90a.tar.bz2 |
Non-required appleframework deps should not be an error. Closes #5295.
Diffstat (limited to 'mesonbuild/dependencies/platform.py')
-rw-r--r-- | mesonbuild/dependencies/platform.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/platform.py b/mesonbuild/dependencies/platform.py index 9863fb1..e913ed4 100644 --- a/mesonbuild/dependencies/platform.py +++ b/mesonbuild/dependencies/platform.py @@ -16,7 +16,7 @@ # platform-specific (generally speaking). from .base import ExternalDependency, DependencyException - +from ..mesonlib import MesonException class AppleFrameworks(ExternalDependency): def __init__(self, env, kwargs): @@ -31,7 +31,16 @@ class AppleFrameworks(ExternalDependency): raise DependencyException('No C-like compilers are available, cannot find the framework') self.is_found = True for f in self.frameworks: - args = self.clib_compiler.find_framework(f, env, []) + try: + args = self.clib_compiler.find_framework(f, env, []) + except MesonException as e: + if 'non-clang' in str(e): + self.is_found = False + self.link_args = [] + self.compile_args = [] + return + raise + if args is not None: # No compile args are needed for system frameworks self.link_args += args |