diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-11-19 00:00:49 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-11-19 00:00:49 +0000 |
| commit | cc79ed353b13082af02986e33fcbb8adca62725e (patch) | |
| tree | df0108618d6215fbfceeda83124b2ac39e021710 /utils | |
| parent | f8539a68b2c7f6ccfab66a18810567c1a43dd5a6 (diff) | |
[LIT] Fix testing out-of-tree Clang builds
Summary:
Currently, LIT configures the LLVM binary path before the Clang binary path. However this breaks testing out-of-tree Clang builds (where the LLVM binary path includes a copy of Clang).
This patch reverses the order of the paths when looking for Clang, putting the Clang binary directory first.
Reviewers: zturner, beanz, chapuni, modocache, EricWF
Reviewed By: EricWF
Subscribers: mgorny, cfe-commits, llvm-commits
Differential Revision: https://reviews.llvm.org/D40217
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318607 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lit/lit/llvm/config.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/lit/lit/llvm/config.py b/utils/lit/lit/llvm/config.py index 565220c06f0..c631f8b8865 100644 --- a/utils/lit/lit/llvm/config.py +++ b/utils/lit/lit/llvm/config.py @@ -367,10 +367,10 @@ class LLVMConfig(object): self.clear_environment(possibly_dangerous_env_vars) # Tweak the PATH to include the tools dir and the scripts dir. - paths = [self.config.llvm_tools_dir] - tools = getattr(self.config, 'clang_tools_dir', None) - if tools: - paths = paths + [tools] + # Put Clang first to avoid LLVM from overriding out-of-tree clang builds. + possible_paths = ['clang_tools_dir', 'llvm_tools_dir'] + paths = [getattr(self.config, pp) for pp in possible_paths + if getattr(self.config, pp, None)] self.with_environment('PATH', paths, append_path=True) paths = [self.config.llvm_shlib_dir, self.config.llvm_libs_dir] |