aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-05-02 16:22:08 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-11-14 15:57:37 -0800
commitcaf1066cd198ecf66cc5a4e2958627e5a4a5c26b (patch)
tree4795fb4627766b33628ba639930a449aa7b06655 /mesonbuild
parent42ddc30cfef6aebf4f8b595be4ac0dfa6f4da098 (diff)
downloadmeson-caf1066cd198ecf66cc5a4e2958627e5a4a5c26b.zip
meson-caf1066cd198ecf66cc5a4e2958627e5a4a5c26b.tar.gz
meson-caf1066cd198ecf66cc5a4e2958627e5a4a5c26b.tar.bz2
dependencies: Allow config tool dependencies to use native files
This allows tools like llvm-config to be selected from the config file Fixes: #3327
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/dependencies/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index a7e2980..3b4edc2 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -399,6 +399,8 @@ class ConfigToolDependency(ExternalDependency):
'Falling back to searching PATH. This may find a '
'native version of {0}!'.format(self.tool_name))
tools = self.tools
+ elif self.tool_name in self.env.config_info.binaries:
+ tools = [self.env.config_info.binaries[self.tool_name]]
else:
tools = self.tools