aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-10-11 09:23:06 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2018-10-11 23:20:22 +0300
commitbe07a710ee45232a60b6add2da7b9e33f90a1d2f (patch)
tree5b1b8bdbc040602c293a4633a3b781ad5e374aa1
parent302df74cc316501383259e6dc998c506278dc519 (diff)
downloadmeson-be07a710ee45232a60b6add2da7b9e33f90a1d2f.zip
meson-be07a710ee45232a60b6add2da7b9e33f90a1d2f.tar.gz
meson-be07a710ee45232a60b6add2da7b9e33f90a1d2f.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.py3
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(