summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/lit/lit/llvm/subst.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/utils/lit/lit/llvm/subst.py b/utils/lit/lit/llvm/subst.py
index e570f4ebf09..3c8db1d31ff 100644
--- a/utils/lit/lit/llvm/subst.py
+++ b/utils/lit/lit/llvm/subst.py
@@ -12,9 +12,14 @@ class FindTool(object):
self.name = name
def resolve(self, config, dirs):
- command = lit.util.which(self.name, dirs)
- if not command:
- return None
+ # Check for a user explicitely overriding a tool. This allows:
+ # llvm-lit -D llc="llc -enable-misched -verify-machineinstrs"
+ command = config.lit_config.params.get(self.name)
+ if command is None:
+ # Then check out search paths.
+ command = lit.util.which(self.name, dirs)
+ if not command:
+ return None
if self.name == 'llc' and os.environ.get('LLVM_ENABLE_MACHINE_VERIFIER') == '1':
command += ' -verify-machineinstrs'