diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2018-10-11 09:23:06 -0700 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-16 15:56:19 +0530 |
commit | 04117dc8ee2b6419fd6b88821963d8f38b813c64 (patch) | |
tree | a488e48a0057b09b9879199c97c2c65e808be531 | |
parent | 7c19bd55391935f546d20f86924103bd3d74d1ba (diff) | |
download | meson-04117dc8ee2b6419fd6b88821963d8f38b813c64.zip meson-04117dc8ee2b6419fd6b88821963d8f38b813c64.tar.gz meson-04117dc8ee2b6419fd6b88821963d8f38b813c64.tar.bz2 |
dependencies/llvm: Mark as not found when not found
When either the shard or static libs are not available, and the
dependency is not required mark the dependency as not found and return.
Fixes #4360
-rw-r--r-- | mesonbuild/dependencies/dev.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 1e7c3e8..47beb4e 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -310,6 +310,7 @@ class LLVMDependency(ConfigToolDependency): if not matches: if self.required: raise + self.is_found = False return self.link_args = self.get_config_value(['--ldflags'], 'link_args') @@ -326,6 +327,8 @@ class LLVMDependency(ConfigToolDependency): except DependencyException: if self.required: raise + self.is_found = False + return link_args = ['--link-static', '--system-libs'] if self.static else ['--link-shared'] self.link_args = self.get_config_value( |